Skip to content

[CHERRY-PICK] feat: replace redis with valkey as cache backend (#23157)#23261

Merged
wy65701436 merged 1 commit into
goharbor:release-2.15.0from
chlins:release-2.15.0/feat/valkey
May 22, 2026
Merged

[CHERRY-PICK] feat: replace redis with valkey as cache backend (#23157)#23261
wy65701436 merged 1 commit into
goharbor:release-2.15.0from
chlins:release-2.15.0/feat/valkey

Conversation

@chlins

@chlins chlins commented May 19, 2026

Copy link
Copy Markdown
Member

Thank you for contributing to Harbor!

Comprehensive Summary of your change

Cherry-pick of #23157

Issue being fixed

Fixes #(issue)

Please indicate you've done the following:

  • Well Written Title and Summary of the PR
  • Label the PR as needed. "release-note/ignore-for-release, release-note/new-feature, release-note/update, release-note/enhancement, release-note/community, release-note/breaking-change, release-note/docs, release-note/infra, release-note/deprecation"
  • Accepted the DCO. Commits without the DCO will delay acceptance.
  • Made sure tests are passing and test coverage is added if needed.
  • Considered the docs impact and opened a new docs issue or PR with docs changes if needed in website repository.

@chlins
chlins requested a review from a team as a code owner May 19, 2026 05:48
@chlins
chlins force-pushed the release-2.15.0/feat/valkey branch from 896c887 to 9b115c0 Compare May 19, 2026 05:49
@codecov

codecov Bot commented May 19, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (release-2.15.0@4c48f94). Learn more about missing BASE report.

Additional details and impacted files

Impacted file tree graph

@@                Coverage Diff                @@
##             release-2.15.0   #23261   +/-   ##
=================================================
  Coverage                  ?   65.99%           
=================================================
  Files                     ?     1074           
  Lines                     ?   116684           
  Branches                  ?     2952           
=================================================
  Hits                      ?    77002           
  Misses                    ?    35405           
  Partials                  ?     4277           
Flag Coverage Δ
unittests 65.99% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Comment thread make/photon/valkey/Dockerfile.base Outdated
@chlins
chlins force-pushed the release-2.15.0/feat/valkey branch from 9b115c0 to 5ca10f4 Compare May 19, 2026 07:47

@jUDASmILE jUDASmILE left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@wy65701436 wy65701436 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm


set -eo pipefail

if ping="$(valkey-cli -h "127.0.0.1" ping)" && [ "$ping" = 'PONG' ]; then

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's worth confirming this remains valid if the image enables auth/TLS/custom port in the future.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we can verify the compatibility for these scenarios later.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Cherry-pick that migrates Harbor’s internal cache image/build plumbing from Redis to Valkey, updating build targets and compose templates so the default “redis” service runs the Valkey-based image.

Changes:

  • Replace redis-photon image references with valkey-photon in build and compose/test templates.
  • Add Valkey Photon Dockerfiles/healthcheck/config and wire Valkey into Photon build targets.
  • Update nightly Trivy scan image list to include valkey-photon (but currently has a matrix variable mismatch that will break the workflow).

Reviewed changes

Copilot reviewed 10 out of 11 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tests/docker-compose.test.yml Switch test compose cache image from redis-photon to valkey-photon.
Makefile Replace redis base target/image in build/save lists with valkey.
make/photon/valkey/redis.conf Add Valkey (Redis-compatible) server configuration used by the Valkey image.
make/photon/valkey/Dockerfile.base Define Valkey base image (user/group + package install).
make/photon/valkey/Dockerfile Define valkey-photon image using Valkey base + config + healthcheck.
make/photon/valkey/docker-healthcheck Add Valkey healthcheck script using valkey-cli.
make/photon/redis/Dockerfile Remove Redis Photon image Dockerfile.
make/photon/redis/docker-healthcheck Remove Redis healthcheck script.
make/photon/prepare/templates/docker_compose/docker-compose.yml.jinja Switch installer-generated compose to use valkey-photon for the redis service.
make/photon/Makefile Replace _build_redis with _build_valkey and update image/path variables.
.github/workflows/nightly-trivy-scan.yml Update nightly scan matrix to include valkey-photon (currently broken due to matrix key mismatch).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .github/workflows/nightly-trivy-scan.yml
@Vad1mo

Vad1mo commented May 20, 2026

Copy link
Copy Markdown
Member

IMO it makes sense to release the change in 2.16 to have a clear cut instead of 2.15.2

@chlins
chlins force-pushed the release-2.15.0/feat/valkey branch from 5ca10f4 to 8117559 Compare May 20, 2026 07:59
@wy65701436
wy65701436 merged commit 3b21f68 into goharbor:release-2.15.0 May 22, 2026
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants