Merge pull request #4854 from chymy/fix-judge-err

k8s-ci-robot · web-flow · commit d2c2ddb90a8a · 2021-06-29T14:22:19.000-07:00
🐛  Fix conditional judgment issue in upgradeControlPlane
diff --git a/controlplane/kubeadm/controllers/upgrade.go b/controlplane/kubeadm/controllers/upgrade.go
@@ -38,7 +38,7 @@ func (r *KubeadmControlPlaneReconciler) upgradeControlPlane(
 ) (ctrl.Result, error) {
 	logger := controlPlane.Logger()
 
-	if kcp.Spec.RolloutStrategy == nil && kcp.Spec.RolloutStrategy.RollingUpdate == nil {
+	if kcp.Spec.RolloutStrategy == nil || kcp.Spec.RolloutStrategy.RollingUpdate == nil {
 		return ctrl.Result{}, errors.New("rolloutStrategy is not set")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func (r *KubeadmControlPlaneReconciler) upgradeControlPlane(`
`38`	`38`	`) (ctrl.Result, error) {`
`39`	`39`	`logger := controlPlane.Logger()`
`40`	`40`
`41`		`- if kcp.Spec.RolloutStrategy == nil && kcp.Spec.RolloutStrategy.RollingUpdate == nil {`
	`41`	`+ if kcp.Spec.RolloutStrategy == nil \|\| kcp.Spec.RolloutStrategy.RollingUpdate == nil {`
`42`	`42`	`return ctrl.Result{}, errors.New("rolloutStrategy is not set")`
`43`	`43`	`}`
`44`	`44`