Skip to content

Commit f13e68a

Browse files
authored
[kilo] Switch from fork to upstream squat/kilo (#2259)
## 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-cidr` flag for IP auto-detection filtering (#403) - Allowed-location-ips overlap with node IPs fix (#404) - Auto-detect WireGuard MTU from underlay interface (#406) - Preferred source for WireGuard routes (#408) - Cilium IPIP overlay support (#409) The fork only retained rebranding and CI-specific commits beyond upstream, which are no longer needed. Changes: - Makefile: point to `squat/kilo` repo and `ghcr.io/squat/kilo` image - values.yaml: updated via `make update` to `0.7.0` with digest pin ### Release note ```release-note [kilo] Switch from cozystack/kilo fork to upstream squat/kilo v0.7.0 ``` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Updates** * Updated the kilo component to use a different source repository and new version configuration. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents dfe16ed + b43b7b2 commit f13e68a

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎packages/system/kilo/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ include ../../../hack/common-envs.mk
55
include ../../../hack/package.mk
66

77
update:
8-
tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/cozystack/kilo | awk -F'[/^]' 'END{print $$3}') && \
9-
digest=$$(skopeo inspect --override-os linux --override-arch amd64 --format '{{.Digest}}' docker://ghcr.io/cozystack/cozystack/kilo:amd64-$${tag}) && \
10-
REPOSITORY="ghcr.io/cozystack/cozystack/kilo" \
8+
tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/squat/kilo | awk -F'[/^]' 'END{print $$3}') && \
9+
digest=$$(skopeo inspect --override-os linux --override-arch amd64 --format '{{.Digest}}' docker://ghcr.io/squat/kilo:$${tag}) && \
10+
REPOSITORY="ghcr.io/squat/kilo" \
1111
yq -i '.kilo.image.repository = strenv(REPOSITORY)' values.yaml && \
1212
TAG="$${tag}@$${digest}" \
1313
yq -i '.kilo.image.tag = strenv(TAG)' values.yaml

‎packages/system/kilo/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
kilo:
22
image:
33
pullPolicy: IfNotPresent
4-
tag: v0.8.2@sha256:9f27000ffd0bbf9adf3aefd017b7835dfae57b6ea38bf7488fb636536c2467da
5-
repository: ghcr.io/cozystack/cozystack/kilo
4+
tag: 0.7.0@sha256:c7468aee96425f47369fd1d33b9736147aebc2e9c6e4355d0593461c30af308e
5+
repository: ghcr.io/squat/kilo
66
transitCIDR: 100.66.0.0/16
77
meshGranularity: location
88
cleanUpInterface: false

0 commit comments

Comments
 (0)