Review findings from #3436, plus what an adversarial re-check of the first
attempt at them turned up.
The chart-name extraction was a greedy sed, i.e. LAST match. Helm marshals
"config" (the release`s values) after "chart", so a values subtree that spells
chart.metadata.name shadowed the real chart name: the release then read as
non-SeaweedFS, the tenant silently vanished from the report, and the script
exited 0 -- the precise false clean this PR exists to prevent, reachable
without any corruption at all. It now takes the FIRST match. The path stays
adjacent on purpose: a looser "any name after metadata" matches
chart.templates[].name, which Helm emits immediately after metadata on every
healthy release, so the review`s suggested relaxation would have returned a
template path for every tenant. Over-strictness fails loudly and recoverably;
over-looseness deletes data quietly.
Newlines are now folded before matching, so a pretty-printed payload parses at
all rather than aborting, and whitespace around the punctuation is tolerated.
first_deployed got the same treatment -- it had the identical greedy, single-
line-only shape, and a spaced payload silently dropped the PV-vintage row from
the report.
The FATAL message names the path it read and the shape it expected, so a future
Helm format change is diagnosable instead of looking like real corruption.
Tests: three new payload shapes (spaced, pretty multi-line, and a values decoy)
each byte-compared against the same golden as the compact payload, so the shape
must make no difference to the report. Mutation-checked -- restoring last-match
extraction fails the decoy test on its own, restoring the single-line matcher
fails the pretty test.
The test fake answered any unmodelled kubectl invocation with exit 0 and empty
stdout, the fail-open shape this script was rewritten to reject, and enough to
let a newly added query pass the goldens unnoticed. Unmodelled calls now exit 97
naming the invocation. Verified inert first by instrumenting the fake: 88
invocations across the suite, none unmodelled. Also added the missing test for
the by-name PVC GET fatal path, whose FAIL mode existed with nothing behind it.
The runbook now tells the operator to read the exit code: a non-zero exit means
the table is incomplete and no step may be taken on it. That contract lived only
in the script header, while the runbook is what the operator follows.
29/29 tests green; sh -n clean.
Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
(cherry picked from commit e02adad38f)
Backport of #3333 onto release-1.5.
spec.components.platform.values.backupStorage on the
cozystack.cozystack-platform Package -- the documented override path for
the cozy-default BackupClass -- never reached the
backupstrategy-controller HelmRelease, so endpoint/region/bucketName
overrides for an external S3 were silently dropped (#3245). The platform
chart now forwards the block into the emitted child Package the same way
bundles/iaas.yaml forwards kubevirt and gpu-operator values. The 4-arg
cozystack.platform.package helper the change needs already exists on this
branch.
Two conflicts, both from unrelated drift in the touched files rather than
from the fix:
* platform values.yaml -- main's hunk carries `monitoring.rootEnabled`
alongside `backupStorage`. That key belongs to the tenant-root
monitoring gate (#3181), which is not on release-1.5 and whose absence
nothing here depends on, so only the backupStorage block is taken.
* docs/operations/backup-classes.md -- the conflicting hunk rewrites the
Postgres upgrade note for the CNPG barman plugin migration
(spec.plugins + ObjectStore), which is 1.6 behaviour. release-1.5 still
renders spec.backup.barmanObjectStore, so this branch keeps its own
prose. The rest of the doc update applied cleanly and was checked
claim-by-claim against this branch rather than assumed: the
helmrelease-interval flag, the cozy-backup-controller namespace, the
cozystack_backup_credentials_projection_* metric names and the
provisionBucket / namespace / bucketName knobs the new table rows
describe all exist here.
Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
(cherry picked from commit 13aa3cb31e71f89e6ffe2a5fcd0fcd9e3f80e970)
Backport of #3339 onto release-1.5, on top of the #3282 adopt-in-place
fix (#3326).
Three differences from main, all forced by what release-1.5 does not
carry:
* The repair migration is renumbered 53 -> 45 and stamps 46, since
release-1.5 tops out at migration 44 with targetVersion 45.
platform values.yaml goes to targetVersion 46.
* Migrations 43 and 45 keep release-1.5's inline labelled stamp
instead of lib/cozystack-version.sh. That helper is the shared
stamp refactor (#2980), whose backport (#3065) was closed, so it
does not exist on this branch. Only lib/seaweedfs-db-adopt.sh --
the part that actually carries the fix -- is sourced.
* The extra/seaweedfs post-delete cleanup hook and its three tests
are dropped. The hook arrived with #3092, a breaking change that
was never backported, so there is nothing here for #3339's changes
to it to apply to. Comments in lib/seaweedfs-db-adopt.sh and the
recovery runbook that promised the hook would reclaim an orphaned
volume are corrected to say it does not on 1.5.x.
The migration renumbering is carried through the shared helper, the
bats suite (STAMP 54 -> 46) and the runbook prose.
Verified locally: helm unittest green for both seaweedfs charts (51 + 16
assertions) including both blind-upgrade guard canaries, and 34 bats
assertions across migration-seaweedfs-db-adopt, seaweedfs-naming-audit
and seaweedfs-guard-parity.
Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
(cherry picked from commit 88e9fdcbbbff8aeab317b08557ca6bd6c8b5706d)
Classify each tenant from its volume PVCs, re-bind the volumes of a tenant
installed fresh on 1.5.x so the adopted names pick them up, stop a split cluster
before upgrading it, and clear the leftovers the upgrade cannot remove itself.
The recovery steps select the renamed set by a precise filter and derive secret
names from the fullname helper, so they work for an instance running under a
non-default name and for pooled or zoned volumes.
Co-authored-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Aleksei Sviridkin <f@lex.la>
(cherry picked from commit 088669fb5ae5106aa1d4d22e3226488f557e4b02)
Document the five instance-type series (t1/c1/s1/u1/m1) introduced
alongside the legacy preset deprecation, the per-size CPU and memory
matrix, and the 1:1 legacy-to-instance-type mapping table that powers
cozy-lib aliases, migration 39, and the operator-side deprecation
warning.
Single source of truth referenced from:
- packages/library/cozy-lib/templates/_resourcepresets.tpl
- packages/core/platform/images/migrations/migrations/39
- pkg/apis/apps/presets/legacy.go
Includes an explicit callout that legacy `medium` (1 CPU / 1Gi) and
instance-type `*.medium` (2 CPU) are not the same — same word,
different resources.
Replace inline preset tables in packages/apps/postgres/README.md and
packages/apps/kafka/README.md with a short paragraph that names the
five series and points at the canonical doc, since the per-app
inline tables listed only the legacy seven and would drift further
as the canonical matrix evolves.
Co-authored-by: Matthieu ROBIN <matthieu@hidora.com>
Signed-off-by: Aleksei Sviridkin <f@lex.la>
myasnikovdaniil