Merge pull request #242 from accepting/opt

k8s-ci-robot · web-flow · commit e5441e0a044c · 2019-09-23T12:25:24.000-07:00
Patch kubeadmconfig objects only if no error occurs during reconciliation
diff --git a/controllers/kubeadmconfig_controller.go b/controllers/kubeadmconfig_controller.go
@@ -151,12 +151,11 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	// Always attempt to Patch the KubeadmConfig object and status after each reconciliation.
+	// Attempt to Patch the KubeadmConfig object and status after each reconciliation if no error occurs.
 	defer func() {
-		if err := patchHelper.Patch(ctx, config); err != nil {
-			log.Error(err, "failed to patch config")
-			if rerr == nil {
-				rerr = err
+		if rerr == nil {
+			if rerr = patchHelper.Patch(ctx, config); rerr != nil {
+				log.Error(rerr, "failed to patch config")
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -151,12 +151,11 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, re`
`151`	`151`	`if err != nil {`
`152`	`152`	`return ctrl.Result{}, err`
`153`	`153`	`}`
`154`		`- // Always attempt to Patch the KubeadmConfig object and status after each reconciliation.`
	`154`	`+ // Attempt to Patch the KubeadmConfig object and status after each reconciliation if no error occurs.`
`155`	`155`	`defer func() {`
`156`		`- if err := patchHelper.Patch(ctx, config); err != nil {`
`157`		`- log.Error(err, "failed to patch config")`
`158`		`- if rerr == nil {`
`159`		`- rerr = err`
	`156`	`+ if rerr == nil {`
	`157`	`+ if rerr = patchHelper.Patch(ctx, config); rerr != nil {`
	`158`	`+ log.Error(rerr, "failed to patch config")`
`160`	`159`	`}`
`161`	`160`	`}`
`162`	`161`	`}()`