chore: optimize the conflict log and webhook retry with error log detail (#29)

* feat: add session affinity for service

* chore: update conflict with retry and webhook retry with error log detail

* chore: webhook retry with error log detail

* chore: optimize the conflict log and webhook retry with error log detail

---------

Co-authored-by: hardy <[email protected]>

Author: luohoufu

internal/controller/common/kubeutil/apply.go

@@ -30,6 +30,7 @@ import (
 	"fmt"
 
 	"github.com/cisco-open/operator-tools/pkg/reconciler"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" // For OperationResult
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -155,7 +156,11 @@ func ApplyObjectV2(ctx context.Context, k8sClient reconciler.ResourceReconciler,
 	_, err := k8sClient.ReconcileResource(obj, reconciler.StatePresent)
 	if err != nil {
 		// Log the error if the apply operation fails.
-		logger.Error(err, "Failed to apply object using Server-Side Apply")
+		if apierrors.IsConflict(err) {
+			logger.V(1).Info("Optimistic lock conflict detected when applying resource", "kind", gvk.Kind, "name", objKey.Name, "namespace", objKey.Namespace)
+		} else {
+			logger.Error(err, "Failed to apply object using Server-Side Apply", "kind", gvk.Kind, "name", objKey.Name, "namespace", objKey.Namespace)
+		}
 		return ApplyResult{Error: err}
 	}
 

pkg/webrecorder/recorder.go

@@ -229,7 +229,6 @@ func (r *WebhookEventRecorder) sendEvent(data *WebhookEvent) {
 		resp, err := r.httpClient.Do(req)
 		if err != nil {
 			r.logger.Error(err, "Failed to send webhook event", "url", r.webhookURL)
-			// 快速失败：如果是连接拒绝或EOF，不再重试
 			if isNetworkError(err) {
 				r.logger.Info("Network error detected, skipping remaining retries", "error", err.Error())
 				return
@@ -244,7 +243,7 @@ func (r *WebhookEventRecorder) sendEvent(data *WebhookEvent) {
 
 		// On successful send, check the status code.
 		if resp.StatusCode >= 200 && resp.StatusCode < 300 {
-			r.logger.V(1).Info("Successfully sent event to webhook", "url", r.webhookURL, "status", resp.Status)
+			r.logger.Info("Successfully sent event to webhook", "url", r.webhookURL, "status", resp.Status)
 			return // Success, exit the function.
 		}