Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: support prometheus stack #1004

Merged
merged 1 commit into from
Sep 14, 2024

Conversation

sophon-zt
Copy link
Contributor

No description provided.

@sophon-zt sophon-zt force-pushed the support/redis-support-prometheus-stack branch from d025639 to 0f80457 Compare September 4, 2024 07:40
@sophon-zt sophon-zt merged commit 275b482 into main Sep 14, 2024
15 checks passed
@sophon-zt sophon-zt deleted the support/redis-support-prometheus-stack branch September 14, 2024 03:20
@sophon-zt
Copy link
Contributor Author

/cherry-pick release-0.9

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging addons-cluster/redis-cluster/templates/_helpers.tpl
Auto-merging addons-cluster/redis-cluster/values.yaml
CONFLICT (content): Merge conflict in addons-cluster/redis-cluster/values.yaml
error: could not apply 275b482... chore: support prometheus stack (#1004)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks-addons/actions/runs/10859120829

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants