Skip to content

Commit cc9da3a

Browse files
fix(tenant): bump parent HR timeout to 15m to cover seaweedfs split
PR #2619 split seaweedfs into a serialized chain (seaweedfs-db -> seaweedfs-system -> seaweedfs) that needs ~5 min of wall-clock to install: CNPG bootstrap, master quorum, then the wrapper. With the prior 5m wait budget on the parent tenant HR, helm-controller would time out before the children reach Ready, rollback would delete the child HRs, and the upgrade would retry in a loop. The e2e bats step that patches the Tenant CR and waits 60s for child HRs to exist landed in the rollback gap and timed out. Two complementary changes: - tenant-root is created statically by cozystack-basics, so its HelmRelease spec.timeout is bumped 5m -> 15m directly. - Sub-tenants (Tenant CRs) get their HR built by cozystack-api from the tenant ApplicationDefinition. Add the release.cozystack.io/helm-install-timeout=15m annotation that kubernetes-rd already uses to opt the kind into the longer budget. Keeps both values in lockstep and documents the coupling inline. Assisted-By: Claude <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent a7b40bc commit cc9da3a

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

‎packages/system/cozystack-basics/templates/tenant-root.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
name: cozystack-tenant-application-default-tenant
2323
namespace: cozy-system
2424
interval: 1m0s
25-
timeout: 5m0s
25+
timeout: 15m0s
2626
valuesFrom:
2727
- kind: Secret
2828
name: cozystack-values

‎packages/system/tenant-rd/cozyrds/tenant.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@ apiVersion: cozystack.io/v1alpha1
22
kind: ApplicationDefinition
33
metadata:
44
name: tenant
5+
annotations:
6+
# Tenant charts install a serial chain of child HelmReleases (seaweedfs,
7+
# monitoring, etcd, ingress). The seaweedfs subtree alone is now
8+
# seaweedfs-db -> seaweedfs-system -> seaweedfs (~5 min wall-clock for
9+
# CNPG bootstrap + master quorum). Flux helm-controller's default 5m
10+
# wait budget on the parent tenant HR fires before children reach Ready,
11+
# which rolls back the children and starts an oscillation loop. This
12+
# override is applied by cozystack-api to the HelmRelease
13+
# Spec.Install.Timeout and Spec.Upgrade.Timeout for sub-tenants.
14+
# tenant-root uses a static HR defined in
15+
# packages/system/cozystack-basics/templates/tenant-root.yaml; its
16+
# timeout is set there directly. Keep the two values aligned.
17+
release.cozystack.io/helm-install-timeout: "15m"
518
spec:
619
application:
720
kind: Tenant

0 commit comments

Comments
 (0)