Skip to content

Commit c29d501

Browse files
authored
[objectstorage-controller] Update to v0.2.2, drop upstreamed patches (#2261)
## What this PR does Update COSI controller/sidecar from commit `c2f6e65` to upstream release `v0.2.2` and remove two patches that have been merged: - `89-reconciliation.diff` — fix reconciliation logic for existing and deleted objects (upstream PR #89) - `90-bucket-name.diff` — prefix bucket names with `bucket-` using UID only (upstream PR #90) Both were contributed by kvaps and included in the v0.2.2 release (2025-12-08). Also removes `git` from Dockerfile dependencies as it was only needed for applying patches. Note: `make image` needs to be run to rebuild the container image and update `values.yaml` with the new tag/digest. ### Release note ```release-note [objectstorage-controller] Update to v0.2.2, drop upstreamed patches ``` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Refactor** * Updated object storage controller build configuration to streamline upstream component retrieval and image build process. * Modified resource deletion handling so deletion flows are centralized and consistently enforced across create/update events. * Changed bucket naming scheme—buckets will no longer include the bucket class name in their identifier and follow the simplified naming pattern. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 2253a7e + f1482c5 commit c29d501

3 files changed

Lines changed: 2 additions & 416 deletions

File tree

‎packages/system/objectstorage-controller/images/objectstorage/Dockerfile‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
# syntax=docker/dockerfile:1.2
22

33
FROM alpine AS source
4-
ARG COMMIT_REF=c2f6e651eb58880627ccddafe0d84fb36e03a780
5-
RUN apk add --no-cache curl tar git
4+
ARG COMMIT_REF=v0.2.2
5+
RUN apk add --no-cache curl tar
66
WORKDIR /src
77

88
RUN curl -sSL https://github.com/kubernetes-sigs/container-object-storage-interface/archive/${COMMIT_REF}.tar.gz \
99
| tar -xz --strip-components=1
1010

11-
COPY patches /patches
12-
RUN git apply /patches/*.diff
13-
1411
FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS builder
1512
ARG TARGETOS
1613
ARG TARGETARCH

0 commit comments

Comments
 (0)