[kilo] Switch from fork to upstream squat/kilo - #2259
Conversation
All functional patches from the cozystack/kilo fork have been upstreamed and included in squat/kilo v0.7.0: - --internal-cidr flag (PR #403) - allowed-location-ips overlap fix (PR #404) - Auto-detect WireGuard MTU (PR #406) - Preferred source for WireGuard routes (PR #408) - Cilium IPIP overlay support (PR #409) The fork only contained rebranding and CI-specific commits beyond upstream, which are no longer needed. Assisted-By: Claude <noreply@anthropic.com> Signed-off-by: Aleksei Sviridkin <f@lex.la>
📝 WalkthroughWalkthroughThis change updates the Kilo networking component to reference the upstream Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 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 modernizes the Kilo integration by transitioning from a custom fork to its official upstream repository. This change ensures that the project benefits from the latest upstream developments and maintenance, while also confirming that all previously custom-implemented functional patches are now part of the upstream version. The update includes adjusting build configurations and image references to align with the new upstream source and version. 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 switches the Kilo dependency from a fork to the upstream repository. The changes in the Makefile and values.yaml are correct and reflect this switch. I've found a small inconsistency in the update script in the Makefile, which could be improved for better maintainability. Otherwise, the changes look good.
| tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/cozystack/kilo | awk -F'[/^]' 'END{print $$3}') && \ | ||
| digest=$$(skopeo inspect --override-os linux --override-arch amd64 --format '{{.Digest}}' docker://ghcr.io/cozystack/cozystack/kilo:amd64-$${tag}) && \ | ||
| REPOSITORY="ghcr.io/cozystack/cozystack/kilo" \ | ||
| tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/squat/kilo | awk -F'[/^]' 'END{print $$3}') && \ |
There was a problem hiding this comment.
The update script is inconsistent with the changes in values.yaml. The git ls-remote command will fetch a tag with a v prefix (e.g., v0.7.0), but the values.yaml file is updated with a tag that does not have the v prefix (0.7.0). To make the update script produce the correct tag consistent with values.yaml, you should strip the v prefix from the tag. This will ensure that running make update produces the expected result.
tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/squat/kilo | awk -F'[/^]' 'END{print $$3}' | sed 's/^v//') && \
There was a problem hiding this comment.
Upstream squat/kilo tags do not use the v prefix — they are 0.7.0, 0.6.0, etc. We verified this by running make update which correctly produced 0.7.0 in values.yaml. No stripping needed.
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/system/kilo/Makefile`:
- Around line 8-10: The Makefile is referencing the wrong registry: update the
image registry from ghcr.io to docker.io where the REPOSITORY variable and the
skopeo docker URL are set (the lines computing tag and digest reference
docker://ghcr.io/squat/kilo and REPOSITORY="ghcr.io/squat/kilo"); change both
occurrences to docker.io/squat/kilo. Also update the matching registry entry in
values.yaml (the image repository value referenced on line 5) to
docker.io/squat/kilo so the update/inspect logic targets Docker Hub instead of
GHCR.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 9afdeb13-c9b8-4892-bc38-524de2a2bcfd
📒 Files selected for processing (2)
packages/system/kilo/Makefilepackages/system/kilo/values.yaml
What this PR does
Switch kilo from the cozystack/kilo fork to the upstream squat/kilo
repository (v0.7.0).
All functional patches from the fork have been upstreamed:
--internal-cidrflag for IP auto-detection filtering (Introduce InstanceTypes #403)The fork only retained rebranding and CI-specific commits beyond
upstream, which are no longer needed.
Changes:
squat/kilorepo andghcr.io/squat/kiloimagemake updateto0.7.0with digest pinRelease note
Summary by CodeRabbit