Repository navigation
[objectstorage-controller] Update to v0.2.2, drop upstreamed patches - #2261
Conversation
Update COSI controller/sidecar from commit c2f6e65 to v0.2.2 (f75d475) and remove two patches that have been merged upstream: - 89-reconciliation.diff: fix reconciliation logic for existing and deleted objects (PR #89) - 90-bucket-name.diff: prefix bucket names with bucket- using UID only (PR #90) Both patches were contributed by kvaps and included in the upstream v0.2.2 release (2025-12-08). Also remove git from Dockerfile dependencies as it was only needed for applying patches. Assisted-By: Claude <[email protected]> Signed-off-by: Aleksei Sviridkin <[email protected]>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
📝 WalkthroughWalkthroughThe Dockerfile build was simplified (removed git and patch application; COMMIT_REF set to v0.2.2). Two local patches that altered reconciliation and bucket-name derivation were removed, reverting deletion-handling and bucket naming logic to prior behavior. Changes
Sequence Diagram(s)sequenceDiagram
rect rgba(200,200,255,0.5)
participant K8s as Kubernetes API
participant Controller as ObjectStorage Controller
participant Sidecar as ObjectStorage Sidecar
participant Driver as Storage Driver
end
K8s->>Controller: Add/Update BucketClaim/BucketAccess (may have DeletionTimestamp)
alt Deleted flows were removed (patches deleted)
Controller->>Controller: handle add/update without early deletion guard
Controller->>Driver: create/modify bucket or access
else Prior patched flow (removed)
Controller->>Controller: detect DeletionTimestamp -> deletion handler
Controller->>Driver: delete bucket (ignore NotFound)
Controller->>K8s: remove finalizer / update status
end
K8s->>Sidecar: Add/Update Bucket (may have DeletionTimestamp)
alt Deleted flows were removed (patches deleted)
Sidecar->>Sidecar: handle add/update without centralized deletion path
Sidecar->>Driver: create/modify bucket resources
else Prior patched flow (removed)
Sidecar->>Sidecar: detect DeletionTimestamp -> handleDeletion
Sidecar->>Driver: delete bucketAccess / bucket
Sidecar->>K8s: remove finalizer / update bucket
end
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request updates the COSI controller and sidecar to the latest v0.2.2 release, which includes several fixes and improvements. By updating to this release, the PR removes the need for two custom patches that have been merged upstream, simplifying the codebase and reducing maintenance overhead. The Dockerfile has also been updated to reflect the removal of the patching process. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on Gemini (@gemini-code-assist) comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request updates the objectstorage-controller to version v0.2.2 and removes two patches that have been upstreamed. The changes are logical and correct. I've added one suggestion to the Dockerfile to improve maintainability by using a version tag instead of a commit hash.
| FROM alpine AS source | ||
| ARG COMMIT_REF=c2f6e651eb58880627ccddafe0d84fb36e03a780 | ||
| RUN apk add --no-cache curl tar git | ||
| ARG COMMIT_REF=f75d47509dae3e4ed0fd18ce0a60474b78e8d29b |
Replace commit hash with v0.2.2 tag for better readability. GitHub archive URLs work with tags identically. Assisted-By: Claude <[email protected]> Signed-off-by: Aleksei Sviridkin <[email protected]>
What this PR does
Update COSI controller/sidecar from commit
c2f6e65to upstreamrelease
v0.2.2and remove two patches that have been merged:89-reconciliation.diff— fix reconciliation logic for existingand deleted objects (upstream PR Fix incorrect path to include in Makefiles #89)
90-bucket-name.diff— prefix bucket names withbucket-usingUID only (upstream PR Prepare release v0.3.0 #90)
Both were contributed by kvaps and included in the v0.2.2 release
(2025-12-08).
Also removes
gitfrom Dockerfile dependencies as it was onlyneeded for applying patches.
Note:
make imageneeds to be run to rebuild the container imageand update
values.yamlwith the new tag/digest.Release note
Summary by CodeRabbit