[CHERRY-PICK] feat: replace redis with valkey as cache backend (#23157)#23261
Conversation
896c887 to
9b115c0
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release-2.15.0 #23261 +/- ##
=================================================
Coverage ? 65.99%
=================================================
Files ? 1074
Lines ? 116684
Branches ? 2952
=================================================
Hits ? 77002
Misses ? 35405
Partials ? 4277
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
9b115c0 to
5ca10f4
Compare
|
|
||
| set -eo pipefail | ||
|
|
||
| if ping="$(valkey-cli -h "127.0.0.1" ping)" && [ "$ping" = 'PONG' ]; then |
There was a problem hiding this comment.
It's worth confirming this remains valid if the image enables auth/TLS/custom port in the future.
There was a problem hiding this comment.
Yes, we can verify the compatibility for these scenarios later.
There was a problem hiding this comment.
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-photonimage references withvalkey-photonin 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.
|
IMO it makes sense to release the change in 2.16 to have a clear cut instead of 2.15.2 |
Signed-off-by: chlins <[email protected]>
5ca10f4 to
8117559
Compare
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: