From 2f41d5d2efd501a18ba87a62920518595d42f1b2 Mon Sep 17 00:00:00 2001 From: Gabriele Quaresima Date: Wed, 26 Aug 2026 11:06:45 +0200 Subject: [PATCH] chore(deps): move Kopia fork from leonardoce/kopia to cloudnative-pg/kopia The leonardoce/kopia fork will eventually be closed. Klio now builds Kopia from cloudnative-pg/kopia's klio branch instead, which carries the same three patches (mTLS authentication, snapshot migrate tag support, gRPC session-error logging) rebased onto current upstream Kopia master. Assisted-by: Claude Signed-off-by: Gabriele Quaresima --- AGENTS.md | 2 +- core/Dockerfile | 2 +- operator/test/e2e/otel_test.go | 2 +- renovate.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 8132485b..82a34d60 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -255,7 +255,7 @@ cached index, run tests, then revert. - CloudNativePG API and machinery (`github.com/cloudnative-pg/*`) - Kubernetes controller-runtime (`sigs.k8s.io/controller-runtime`) - NATS for the task queue (`github.com/nats-io/nats.go`) -- Kopia for deduplication (forked at `github.com/leonardoce/kopia`) +- Kopia for deduplication (forked at `github.com/cloudnative-pg/kopia`, branch `klio`) - gRPC for client-server communication ## Documentation diff --git a/core/Dockerfile b/core/Dockerfile index f44af324..3d3b8440 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /workspace # Clone and build Kopia with cache mounts and cross-compilation RUN --mount=type=cache,target=/go/pkg/mod,id=kopia-mod-${TARGETARCH} \ --mount=type=cache,target=/root/.cache/go-build,id=kopia-build-${TARGETARCH} \ - git clone --depth=1 --branch=klio-20260525 https://github.com/leonardoce/kopia && \ + git clone --depth=1 --branch=klio https://github.com/cloudnative-pg/kopia && \ cd kopia && \ CGO_ENABLED=0 GOOS="${TARGETOS}" GOARCH="${TARGETARCH}" \ go build -o kopia main.go diff --git a/operator/test/e2e/otel_test.go b/operator/test/e2e/otel_test.go index 61ea48d5..f6260f3c 100644 --- a/operator/test/e2e/otel_test.go +++ b/operator/test/e2e/otel_test.go @@ -1131,7 +1131,7 @@ func assertOTELTracesReceived( // value "kopia" renders as "Str(kopia)"), governed by the collector image // pinned in otel_collector.yaml; // - Kopia's internal span names ("OpenRepository", "UploadDir"), defined in - // the leonardoce/kopia fork. + // the cloudnative-pg/kopia fork. // If this starts failing after upgrading the collector image or the Kopia // fork, re-derive the expected strings from the collector logs rather than // assuming a regression in trace export. diff --git a/renovate.json b/renovate.json index 1c88dd29..9ccf0548 100644 --- a/renovate.json +++ b/renovate.json @@ -88,7 +88,7 @@ "go" ], "matchPackageNames": [ - "github.com/leonardoce/kopia", + "github.com/cloudnative-pg/kopia", "github.com/leonardoce/afero-s3" ], "enabled": false,