fix(diag): get rid of wrongly logged errors (#5846)

Author: programmer04

CHANGELOG.md

@@ -93,7 +93,7 @@ Adding a new version? You'll need three changes:
   server. This endpoint outputs the original Kong `/config` endpoint error for
   failed configuration pushes in case error parsing fails. Attempt to log the
   `message` field of errors that KIC cannot fully parse.
-  [#5773](https://github.com/Kong/kubernetes-ingress-controller/issues/5773)
+  [#5773](https://github.com/Kong/kubernetes-ingress-controller/issues/5773), [#5846](https://github.com/Kong/kubernetes-ingress-controller/pull/5846)
 - Add constraint to limit items in `Credentials` and `ConsumerGroups` in
   `KongConsumer`s to be unique in validating admission webhooks.
   [#5787](https://github.com/Kong/kubernetes-ingress-controller/pull/5787)

internal/dataplane/kong_client.go

@@ -577,21 +577,30 @@ func (c *KongClient) sendToClient(
 		c.updateStrategyResolver,
 		c.configChangeDetector,
 	)
-
-	c.recordResourceFailureEvents(err.ResourceFailures, KongConfigurationApplyFailedEventReason)
 	// Only record events on applying configuration to Kong gateway here.
+	// Nil error is expected to be passed to indicate success.
 	if !client.IsKonnect() {
 		c.recordApplyConfigurationEvents(err, client.BaseRootURL())
 	}
-	sendDiagnostic(err.Err != nil, err.RawBody)
+	if err != nil {
+		var updateErr sendconfig.UpdateError
+		if errors.As(err, &updateErr) {
+			c.recordResourceFailureEvents(updateErr.ResourceFailures, KongConfigurationApplyFailedEventReason)
 
-	if err.Err != nil {
-		if expired, ok := timedCtx.Deadline(); ok && time.Now().After(expired) {
-			logger.Error(nil, "Exceeded Kong API timeout, consider increasing --proxy-timeout-seconds")
+			sendDiagnostic(updateErr.Err != nil, updateErr.RawBody)
+
+			if updateErr.Err != nil {
+				if err := ctx.Err(); err != nil {
+					logger.Error(err, "Exceeded Kong API timeout, consider increasing --proxy-timeout-seconds")
+				}
+				return "", fmt.Errorf("performing update for %s failed: %w", client.BaseRootURL(), updateErr)
+			}
+		} else {
+			// It should never happen.
+			return "", fmt.Errorf("performing update for %s failed with unexpected type of error: %w", client.BaseRootURL(), err)
 		}
-		return "", fmt.Errorf("performing update for %s failed: %w", client.AdminAPIClient().BaseRootURL(), err)
 	}
-
+	sendDiagnostic(false, nil) // No error occurred.
 	// update the lastConfigSHA with the new updated checksum
 	client.SetLastConfigSHA(newConfigSHA)
 

internal/dataplane/sendconfig/sendconfig.go

@@ -67,7 +67,7 @@ func PerformUpdate(
 	promMetrics *metrics.CtrlFuncMetrics,
 	updateStrategyResolver UpdateStrategyResolver,
 	configChangeDetector ConfigurationChangeDetector,
-) ([]byte, UpdateError) {
+) ([]byte, error) {
 	oldSHA := client.LastConfigSHA()
 	newSHA, err := deckgen.GenerateSHA(targetContent)
 	if err != nil {
@@ -86,7 +86,7 @@ func PerformUpdate(
 			} else {
 				logger.V(util.DebugLevel).Info("No configuration change, skipping sync to Kong")
 			}
-			return oldSHA, UpdateError{}
+			return oldSHA, nil
 		}
 	}
 
@@ -119,7 +119,7 @@ func PerformUpdate(
 		logger.V(util.InfoLevel).Info("Successfully synced configuration to Kong")
 	}
 
-	return newSHA, UpdateError{}
+	return newSHA, nil
 }
 
 // -----------------------------------------------------------------------------