Skip to content

Commit d2c6b85

Browse files
scooby87lexfrei
authored andcommitted
fix(seaweedfs): run the in-tree SeaweedFS image in every component
With the image keys unset the vendored chart renders chrislusf/seaweedfs at its appVersion, so the patched build from images/seaweedfs would be built and never run, and the S3 gateway would keep being OOM-killed on large GETs. Point every component at the in-tree image, pinned by digest like every first-party reference, and hold that in a unit test so a values change cannot quietly fall back to the upstream binary. Assisted-by: LLM Signed-off-by: Alexey Artamonov <[email protected]>
1 parent 1913104 commit d2c6b85

2 files changed

Lines changed: 46 additions & 0 deletions

File tree

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
suite: seaweedfs image
2+
3+
# Every SeaweedFS component must run the in-tree build from images/seaweedfs,
4+
# which carries the patches in images/seaweedfs/patches. The vendored chart
5+
# falls back to chrislusf/seaweedfs at its appVersion when the image keys are
6+
# unset, and that is the unpatched upstream binary. The reference must carry a
7+
# digest, as every first-party reference does (docs/agents/image-refs.md).
8+
9+
templates:
10+
- charts/seaweedfs/templates/master/master-statefulset.yaml
11+
- charts/seaweedfs/templates/volume/volume-statefulset.yaml
12+
- charts/seaweedfs/templates/filer/filer-statefulset.yaml
13+
- charts/seaweedfs/templates/s3/s3-deployment.yaml
14+
# filer-statefulset includes it for its checksum annotation.
15+
- charts/seaweedfs/templates/s3/s3-secret.yaml
16+
17+
release:
18+
name: seaweedfs
19+
namespace: cozy-seaweedfs
20+
21+
tests:
22+
- it: runs the in-tree image in the master
23+
template: charts/seaweedfs/templates/master/master-statefulset.yaml
24+
asserts: &inTreeImage
25+
- matchRegex:
26+
path: spec.template.spec.containers[0].image
27+
pattern: ^ghcr\.io/cozystack/cozystack/seaweedfs:[^@]+@sha256:[0-9a-f]{64}$
28+
29+
- it: runs the in-tree image in the volume servers
30+
template: charts/seaweedfs/templates/volume/volume-statefulset.yaml
31+
asserts: *inTreeImage
32+
33+
- it: runs the in-tree image in the filer
34+
template: charts/seaweedfs/templates/filer/filer-statefulset.yaml
35+
asserts: *inTreeImage
36+
37+
- it: runs the in-tree image in the S3 gateway
38+
template: charts/seaweedfs/templates/s3/s3-deployment.yaml
39+
asserts: *inTreeImage

‎packages/system/seaweedfs/values.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ seaweedfs:
2525
# chart directly from its ExternalArtifact without re-rendering extra/seaweedfs.
2626
# The guard also refuses to render at all if this pin is ever lifted.
2727
fullnameOverride: seaweedfs
28+
# Built in-tree from images/seaweedfs, which carries the patches in
29+
# images/seaweedfs/patches. Without this block the vendored chart falls back
30+
# to chrislusf/seaweedfs at its appVersion, the unpatched upstream build.
31+
# `make image` rewrites both keys on every build.
32+
image:
33+
repository: "ghcr.io/cozystack/cozystack/seaweedfs"
34+
tag: "4.45@sha256:a1a0a27df03d67567852f19eed106a336b2acfe53b4ba9c36c18a26a8ee3043c"
2835
master:
2936
# At the shipped replicationFactor of 2 the size limit and
3037
# extraEnvironmentVars.WEED_MASTER_VOLUME_GROWTH_COPY_2 below are one

0 commit comments

Comments
 (0)