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

ceph: make provisioner replicas configurable (backport #8729) #8795

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 22, 2021

This is an automatic backport of pull request #8729 done by Mergify.
Cherry-pick of ed5f281 has failed:

On branch mergify/bp/release-1.7/pr-8729
Your branch is up to date with 'origin/release-1.7'.

You are currently cherry-picking commit ed5f281a7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Documentation/helm-operator.md
	modified:   cluster/charts/rook-ceph/templates/deployment.yaml
	modified:   cluster/charts/rook-ceph/values.yaml
	modified:   cluster/examples/kubernetes/ceph/operator-openshift.yaml
	modified:   cluster/examples/kubernetes/ceph/operator.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/operator/ceph/csi/spec.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

added new option to set the provisioner replicas.
with this new option the user/admin can choose
how many replicas he want for provisioner pod if
number of nodes is greater than 1.

fixes #8153

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit ed5f281)

# Conflicts:
#	pkg/operator/ceph/csi/spec.go
@mergify mergify bot added the conflicts label Sep 22, 2021
@travisn
Copy link
Member

travisn commented Sep 22, 2021

@Madhu-1 Could you resolve the backport conflicts? You may need to open a new backport PR, thanks

@Madhu-1
Copy link
Member

Madhu-1 commented Sep 23, 2021

closing in favor of #8801

@Madhu-1 Madhu-1 closed this Sep 23, 2021
@mergify mergify bot deleted the mergify/bp/release-1.7/pr-8729 branch September 23, 2021 05:10
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.

None yet

2 participants