From 183c3815164e9ba12f507067cf9f286d80a26c7e Mon Sep 17 00:00:00 2001
From: Robert Coltheart <13191652+robertcoltheart@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:23:54 +1100
Subject: [PATCH] fix: Watching resource with old version should restart (#735)

Fixes #724

Restart the watch loop when we receive HTTP 410 Gone, which seems to
mirror what other k8s frameworks are doing (see: java).
---
 .../Watcher/ResourceWatcher{TEntity}.cs       | 76 ++++++++++++-------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/KubeOps.Operator/Watcher/ResourceWatcher{TEntity}.cs b/src/KubeOps.Operator/Watcher/ResourceWatcher{TEntity}.cs
index 5ffab06c..5484bba8 100644
--- a/src/KubeOps.Operator/Watcher/ResourceWatcher{TEntity}.cs
+++ b/src/KubeOps.Operator/Watcher/ResourceWatcher{TEntity}.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Net;
 using System.Runtime.Serialization;
 using System.Text.Json;
 
@@ -59,39 +60,58 @@ private async Task WatchClientEventsAsync(CancellationToken stoppingToken)
     {
         try
         {
-            await foreach ((WatchEventType type, TEntity? entity) in client.WatchAsync<TEntity>(
-                               settings.Namespace,
-                               cancellationToken: stoppingToken))
+            while (!stoppingToken.IsCancellationRequested)
             {
+                await foreach ((WatchEventType type, TEntity? entity) in client.WatchAsync<TEntity>(
+                                   settings.Namespace,
+                                   cancellationToken: stoppingToken))
+                {
 #pragma warning disable SA1312
-                using var _ = logger.BeginScope(new
+                    using var _ = logger.BeginScope(new
 #pragma warning restore SA1312
-                {
-                    EventType = type,
-
-                    // ReSharper disable once RedundantAnonymousTypePropertyName
-                    Kind = entity?.Kind,
-                    Name = entity?.Name(),
-                    ResourceVersion = entity?.ResourceVersion(),
-                });
-                logger.LogInformation(
-                    """Received watch event "{EventType}" for "{Kind}/{Name}", last observed resource version: {ResourceVersion}.""",
-                    type,
-                    entity?.Kind,
-                    entity?.Name(),
-                    entity?.ResourceVersion());
-                try
-                {
-                    await OnEventAsync(type, entity, stoppingToken);
-                }
-                catch (Exception e)
-                {
-                    logger.LogError(
-                        e,
-                        "Reconciliation of {EventType} for {Kind}/{Name} failed.",
+                    {
+                        EventType = type,
+
+                        // ReSharper disable once RedundantAnonymousTypePropertyName
+                        Kind = entity?.Kind,
+                        Name = entity?.Name(),
+                        ResourceVersion = entity?.ResourceVersion(),
+                    });
+                    logger.LogInformation(
+                        """Received watch event "{EventType}" for "{Kind}/{Name}", last observed resource version: {ResourceVersion}.""",
                         type,
                         entity?.Kind,
-                        entity.Name());
+                        entity?.Name(),
+                        entity?.ResourceVersion());
+                    try
+                    {
+                        await OnEventAsync(type, entity, stoppingToken);
+                    }
+                    catch (KubernetesException e)
+                    {
+                        if (e.Status.Code == (int)HttpStatusCode.Gone)
+                        {
+                            logger.LogDebug("Watch restarting due to 410 HTTP Gone");
+
+                            break;
+                        }
+
+                        LogReconciliationFailed(e);
+                    }
+                    catch (Exception e)
+                    {
+                        LogReconciliationFailed(e);
+                    }
+
+                    void LogReconciliationFailed(Exception exception)
+                    {
+                        logger.LogError(
+                            exception,
+                            "Reconciliation of {EventType} for {Kind}/{Name} failed.",
+                            type,
+                            entity?.Kind,
+                            entity.Name());
+                    }
                 }
             }
         }