Change logging

hyperledger-bevel · Nov 29, 2023 · 8e67a33 · 8e67a33
1 parent c19b5e8
commit 8e67a33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controllers/chaincode/chaincode_controller.go b/controllers/chaincode/chaincode_controller.go
@@ -472,7 +472,7 @@ func (r *FabricChaincodeReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels:      podLabels,
-					Annotations: fabricChaincode.Spec.Annotations,
+					Annotations: fabricChaincode.Spec.PodAnnotations,
 				},
 				Spec: podSpec,
 			},
@@ -575,7 +575,7 @@ func (r *FabricChaincodeReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}
 	}
 	r.setConditionStatus(ctx, fabricChaincode, hlfv1alpha1.RunningStatus, true, nil, false)
-	return ctrl.Result{}, nil
+	return r.updateCRStatusOrFailReconcile(ctx, r.Log, fabricChaincode)
 }
 
 var (

diff --git a/controllers/mainchannel/mainchannel_controller.go b/controllers/mainchannel/mainchannel_controller.go
@@ -431,8 +431,8 @@ func (r *FabricMainChannelReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		r.setConditionStatus(ctx, fabricMainChannel, hlfv1alpha1.FailedStatus, false, errors.Wrapf(err, "error converting block to JSON"), false)
 		return r.updateCRStatusOrFailReconcile(ctx, r.Log, fabricMainChannel)
 	}
-	r.Log.Info(fmt.Sprintf("Config block main channel: %s", buf2.String()))
-	r.Log.Info(fmt.Sprintf("ConfigTX: %v", newConfigTx))
+	log.Debug(fmt.Sprintf("Config block main channel: %s", buf2.String()))
+	log.Debug(fmt.Sprintf("ConfigTX: %v", newConfigTx))
 	err = updateApplicationChannelConfigTx(currentConfigTx, newConfigTx)
 	if err != nil {
 		r.setConditionStatus(ctx, fabricMainChannel, hlfv1alpha1.FailedStatus, false, errors.Wrapf(err, "failed to update application channel config"), false)