Skip to content

Conversation

@raghavendra-talur
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 25, 2021
@raghavendra-talur raghavendra-talur changed the title Failed validation of the StorageCluster spec if both arbiter and flexibleScaling both are enabled Fail validation if both arbiter and flexibleScaling both are enabled Jan 25, 2021
@raghavendra-talur raghavendra-talur changed the title Fail validation if both arbiter and flexibleScaling both are enabled Fail validation if arbiter and flexibleScaling both are enabled Jan 25, 2021
Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
@raghavendra-talur raghavendra-talur force-pushed the rtalur-prevent-arbiter-and-flexible-scaling branch from 4577369 to 0b400e4 Compare January 25, 2021 22:05
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 25, 2021
@raghavendra-talur
Copy link
Contributor Author

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 25, 2021

@raghavendra-talur: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/red-hat-storage-ocs-ci-e2e-aws 0b400e4 link /test red-hat-storage-ocs-ci-e2e-aws

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link
Member

@jarrpa jarrpa left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jarrpa

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 26, 2021
@jarrpa
Copy link
Member

jarrpa commented Jan 26, 2021

@vbnrh This would be another create use case to add to the admission controller.

@openshift-merge-robot openshift-merge-robot merged commit a03bc19 into red-hat-storage:master Jan 26, 2021
@iamniting
Copy link
Member

@raghavendra-talur I think we should cheery-pick this to the 4.7 branch

@agarwal-mudit
Copy link
Member

/cherry-pick release-4.7

@openshift-cherrypick-robot

@agarwal-mudit: #1010 failed to apply on top of branch "release-4.7":

Applying: StorageCluster: validate the spec before reconciling
Using index info to reconstruct a base tree...
M	controllers/storagecluster/reconcile.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/storagecluster/reconcile.go
CONFLICT (content): Merge conflict in controllers/storagecluster/reconcile.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 StorageCluster: validate the spec before reconciling
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@agarwal-mudit
Copy link
Member

@raghavendra-talur This has conflicts, can we manually create a backport PR for this?

@agarwal-mudit
Copy link
Member

@raghavendra-talur This has conflicts, can we manually create a backport PR for this?

Created #1030

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants