Skip to content

Commit c45def3

Browse files
mattia-eleuterimattia-eleuteri
committed
fix(seaweedfs): build the COSI driver at the public-read commit
The -public BucketAccessClass asks the driver for accessPolicy public-read, which no driver release carries yet: v0.4.0 was tagged before seaweedfs/seaweedfs-cosi-driver#21 merged, and the upstream image is only published on a tag. With the driver this package builds, a publicRead bucket gets a BucketAccess the driver refuses with InvalidArgument and is never opened. Build the in-tree image from the merge of that change instead. It also carries the lost-grant fix the previous commit was built for. Switch back to the upstream image once a release carries public-read. Assisted-by: LLM Signed-off-by: Mattia Eleuteri <[email protected]>
1 parent aeb46a8 commit c45def3

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

‎packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcr.io/cozystack/cozystack/seaweedfs-cosi-driver:v0.3.1-16-g5efd120-cozystack.0
1+
ghcr.io/cozystack/cozystack/seaweedfs-cosi-driver:v0.4.0-4-g0ed46df-cozystack.0

‎packages/system/seaweedfs/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ image-seaweedfs:
2222
# `git describe` of the upstream commit pinned by ARG VERSION in
2323
# images/seaweedfs-cosi-driver/Dockerfile; test-cosi-driver-version keeps the
2424
# two in lockstep.
25-
COSI_DRIVER_VERSION = v0.3.1-16-g5efd120
25+
COSI_DRIVER_VERSION = v0.4.0-4-g0ed46df
2626
# Bump when the build changes on the same upstream commit.
2727
COSI_DRIVER_REV = 0
2828
COSI_DRIVER_COMPONENT_VERSION = $(COSI_DRIVER_VERSION)-cozystack.$(COSI_DRIVER_REV)

‎packages/system/seaweedfs/images/seaweedfs-cosi-driver/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
# Built from an upstream commit after v0.3.1: v0.3.1 rewrites only the legacy
1+
# Built from an upstream commit after v0.4.0. v0.3.1 rewrites only the legacy
22
# /etc/iam/identity.json, which the S3 gateways migrate to per-identity files
33
# concurrently, so a grant made during that window is lost for good
4-
# (seaweedfs/seaweedfs-cosi-driver#14). Switch back to the upstream image once a
5-
# release carries the fix.
4+
# (seaweedfs/seaweedfs-cosi-driver#14); v0.4.0 fixes that but predates the
5+
# public-read accessPolicy the -public BucketAccessClass relies on
6+
# (seaweedfs/seaweedfs-cosi-driver#21). Switch back to the upstream image once a
7+
# release carries public-read.
68
FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
79
ARG GOPROXY
810

9-
ARG VERSION=5efd12053d734f47affe4fe2f591373a183c5ff6
10-
ARG SOURCE_SHA256=9608a156de1b839f48aba20672f04978da6d55e5a44c2c40ed40147e9009ab32
11+
ARG VERSION=0ed46dfcf2dd04c954a073d37aad4ccb2d3680c1
12+
ARG SOURCE_SHA256=7bf438679738bb5e4eacb19ce8e5ddf4f6f28504e2428de0711c7acb3b37a112
1113

1214
WORKDIR /src
1315

‎packages/system/seaweedfs/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ seaweedfs:
303303
# S3 actions for every BucketAccess and ignores the accessPolicy parameter.
304304
# v0.3.x honours accessPolicy: readonly, so a -readonly BucketAccessClass
305305
# actually issues read-only credentials instead of read-write. Built here
306-
# from images/seaweedfs-cosi-driver until upstream releases its grant fix.
307-
image: "ghcr.io/cozystack/cozystack/seaweedfs-cosi-driver:v0.3.1-16-g5efd120-cozystack.0"
306+
# from images/seaweedfs-cosi-driver until upstream releases public-read.
307+
image: "ghcr.io/cozystack/cozystack/seaweedfs-cosi-driver:v0.4.0-4-g0ed46df-cozystack.0"
308308
podLabels:
309309
policy.cozystack.io/allow-to-apiserver: "true"
310310
driverName: "seaweedfs.objectstorage.k8s.io"

0 commit comments

Comments
 (0)