WIP: begin the switch to valkey #6

Draft

jessebot wants to merge 4 commits from switch-to-valkey into main

jessebot commented

2026-05-15 16:29:23 +00:00

(Migrated from git.smallhack.org)

Changes

adds a code of conduct
removes bitnami redis and replaces with official valkey helm chart

# Changes - adds a code of conduct - removes bitnami redis and replaces with official valkey helm chart

This pull request has changes conflicting with the target branch.

charts/mastodon/Chart.lock
charts/mastodon/Chart.yaml
charts/mastodon/README.md
charts/mastodon/values.yaml

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: begin the switch to valkey' (#6) from switch-to-valkey into main

Merge commit body

Reviewed-on: https://git.open.engineering/oeng/mastodon-helm-chart/pulls/6

Merge pull request 'WIP: begin the switch to valkey' (#6) from switch-to-valkey into main

Reviewed-on: https://git.open.engineering/oeng/mastodon-helm-chart/pulls/6

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin switch-to-valkey:switch-to-valkey

git switch switch-to-valkey

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff switch-to-valkey

git switch switch-to-valkey

git rebase main

git switch main

git merge --ff-only switch-to-valkey

git switch switch-to-valkey

git rebase main

git switch main

git merge --no-ff switch-to-valkey

git switch main

git merge --squash switch-to-valkey