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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃悰 Fix conditional judgment issue in upgradeControlPlane #4854

Merged
merged 1 commit into from Jun 29, 2021
Merged

馃悰 Fix conditional judgment issue in upgradeControlPlane #4854

merged 1 commit into from Jun 29, 2021

Conversation

chymy
Copy link
Contributor

@chymy chymy commented Jun 25, 2021

What this PR does / why we need it:

|| should be used in the following condition judgment:

if kcp.Spec.RolloutStrategy == nil && kcp.Spec.RolloutStrategy.RollingUpdate == nil {
		return ctrl.Result{}, errors.New("rolloutStrategy is not set")
	}

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 25, 2021
@chymy chymy changed the title 馃尡 Fix conditional judgment issue in upgradeControlPlane 馃悰 Fix conditional judgment issue in upgradeControlPlane Jun 25, 2021
@JoelSpeed
Copy link
Contributor

This seems reasonable to me, does it not cause a panic with the current conditional?

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 25, 2021
@chymy
Fix conditional judgment issue in upgradeControlPlane
81bc3d3 
Signed-off-by: chymy <chang.min1@zte.com.cn>
@enxebre
Copy link
Member

enxebre commented Jun 29, 2021

/lgtm

CecileRobertMichon
CecileRobertMichon reviewed Jun 29, 2021
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2021
@CecileRobertMichon
Copy link
Contributor

/retest

@k8s-ci-robot k8s-ci-robot merged commit d2c2ddb into kubernetes-sigs:master Jun 29, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4 milestone Jun 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@enxebre enxebre Awaiting requested review from enxebre

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@enxebre enxebre

@JoelSpeed JoelSpeed

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v0.4
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@chymy @JoelSpeed @enxebre @k8s-ci-robot @CecileRobertMichon