Skip to content

Commit 3665fb5

Browse files
Clee2691openshift-merge-bot[bot]
authored andcommitted
Revert "LOG-6539: use Patch() instead of Update() in updateStatus func"
This reverts commit b9497a2.
1 parent 9ad1978 commit 3665fb5

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

internal/controller/observability/clusterlogforwarder_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,7 @@ func validateForwarder(forwarderContext internalcontext.ForwarderContext) (valid
212212

213213
func updateStatus(k8Client client.Client, instance *obsv1.ClusterLogForwarder, ready metav1.Condition) {
214214
internalobs.SetCondition(&instance.Status.Conditions, ready)
215-
patch := client.MergeFrom(instance.DeepCopy())
216-
if err := k8Client.Status().Patch(context.TODO(), instance, patch); err != nil {
215+
if err := k8Client.Status().Update(context.TODO(), instance); err != nil {
217216
log.Error(err, "clusterlogforwarder-controller error updating status", "status", instance.Status)
218217
}
219218
}

0 commit comments

Comments
 (0)