Add reconciliation loop

src/crd-controller/HostedServices/V1Alpha2Controller.cs

@@ -24,17 +24,19 @@ public class V1Alpha2Controller : IHostedService
         private readonly IKubernetes mKubernetes;
         private readonly IKeyManagement mKeyManagement;
         private readonly bool mSetOwnerReference;
+        private readonly double mReconciliationIntervalInSeconds;
         private IDisposable mSubscription;
         private readonly ILogger mAuditLogger = Log.ForContext<V1Alpha2Controller>().AsAudit();
         private readonly ILogger mLogger = Log.ForContext<V1Alpha2Controller>();
         private readonly IMetrics mMetrics;
         private const string ApiVersion = "v1alpha2";
 
-        public V1Alpha2Controller(IKubernetes kubernetes, IKeyManagement keyManagement, bool setOwnerReference, IMetrics metrics)
+        public V1Alpha2Controller(IKubernetes kubernetes, IKeyManagement keyManagement, bool setOwnerReference, double reconciliationIntervalInSeconds, IMetrics metrics)
         {
             mKubernetes = kubernetes;
             mKeyManagement = keyManagement;
             mSetOwnerReference = setOwnerReference;
+            mReconciliationIntervalInSeconds = reconciliationIntervalInSeconds;
             mMetrics = metrics;
         }
 
@@ -44,13 +46,13 @@ public Task StopAsync(CancellationToken cancellationToken)
             return Task.CompletedTask;
         }
 
-        public Task StartAsync(CancellationToken token)
+        private IDisposable ObserveKamusSecret(CancellationToken token)
         {
-            mSubscription = mKubernetes.ObserveClusterCustomObject<KamusSecret>(
+            return mKubernetes.ObserveClusterCustomObject<KamusSecret>(
                     "soluto.com",
-                     ApiVersion,
-                     "kamussecrets",
-                     token)
+                    ApiVersion,
+                    "kamussecrets",
+                    token)
                 .SelectMany(x =>
                     Observable.FromAsync(async () => await HandleEvent(x.Item1, x.Item2))
                 )
@@ -66,7 +68,16 @@ public Task StartAsync(CancellationToken token)
                         mLogger.Information("Watching KamusSecret events completed, terminating process");
                         Environment.Exit(0);
                     });
-
+        }
+        public Task StartAsync(CancellationToken token)
+        {
+            mSubscription = ObserveKamusSecret(token);
+            Observable.Interval(TimeSpan.FromSeconds(mReconciliationIntervalInSeconds)).Subscribe((s) =>
+            {
+                mSubscription.Dispose();
+                mSubscription = ObserveKamusSecret(token);
+            });
+
             mLogger.Information("Starting watch for KamusSecret V1Alpha2 events");
 
             return Task.CompletedTask;

src/crd-controller/Startup.cs

@@ -63,10 +63,11 @@ public void ConfigureServices (IServiceCollection services) {
             services.AddHostedService(serviceProvider =>
             {
                 var setOwnerReference = Configuration.GetValue<bool>("Controller:SetOwnerReference", true);
+                var reconciliationIntervalInSeconds = Configuration.GetValue<double>("Controller:ReconciliationIntervalInSeconds", 60);
                 var kubernetes = serviceProvider.GetService<IKubernetes>();
                 var kms = serviceProvider.GetService<IKeyManagement>();
                 var metrics = serviceProvider.GetService<IMetrics>();
-                return new V1Alpha2Controller(kubernetes, kms, setOwnerReference, metrics);
+                return new V1Alpha2Controller(kubernetes, kms, setOwnerReference, reconciliationIntervalInSeconds, metrics);
             });
 
             services.AddHealthChecks()

tests/crd-controller/FlowTest.cs

@@ -116,6 +116,50 @@ public async Task CreateKamusSecret_LabelsAndAnnotationsCopied()
             Assert.Equal("value", v1Secret.Metadata.Annotations.First(x => x.Key == "key").Value);
         }
 
+        [Fact]
+        public async Task CreateKamusSecret_DeleteSecret_ReconciliationRecreateIt()
+        {
+            Cleanup();
+            await DeployController();
+            var kubernetes = new Kubernetes(KubernetesClientConfiguration.BuildDefaultConfig());
+
+            var result = await kubernetes.ListNamespacedSecretWithHttpMessagesAsync(
+                "default",
+                watch: true
+            );
+
+            var subject = new ReplaySubject<(WatchEventType, V1Secret)>();
+
+            result.Watch<V1Secret>(
+                onEvent: (@type, @event) => subject.OnNext((@type, @event)),
+                onError: e => subject.OnError(e),
+                onClosed: () => subject.OnCompleted());
+
+            RunKubectlCommand("apply -f tls-KamusSecretV1Alpha2-with-annotations.yaml");
+            mTestOutputHelper.WriteLine("Waiting for secret creation");
+            var (_, v1Secret) = await subject
+                .Where(t => t.Item1 == WatchEventType.Added && t.Item2.Metadata.Name == "my-tls-secret").Timeout(TimeSpan.FromSeconds(30)).FirstAsync();
+
+            Assert.Equal(1, v1Secret.Metadata.Labels.Count);
+            Assert.True(v1Secret.Metadata.Labels.Keys.Contains("key"));
+            Assert.Equal("value", v1Secret.Metadata.Labels.First(x => x.Key == "key").Value);
+            Assert.Equal(1, v1Secret.Metadata.Annotations.Count);
+            Assert.True(v1Secret.Metadata.Annotations.Keys.Contains("key"));
+            Assert.Equal("value", v1Secret.Metadata.Annotations.First(x => x.Key == "key").Value);
+
+            RunKubectlCommand($"delete secret {v1Secret.Metadata.Name}");
+
+            var (_, v1SecretRecreation) = await subject
+                .Where(t => t.Item1 == WatchEventType.Added && t.Item2.Metadata.Name == "my-tls-secret").Timeout(TimeSpan.FromSeconds(15)).FirstAsync();
+
+            Assert.Equal(1, v1SecretRecreation.Metadata.Labels.Count);
+            Assert.True(v1SecretRecreation.Metadata.Labels.Keys.Contains("key"));
+            Assert.Equal("value", v1SecretRecreation.Metadata.Labels.First(x => x.Key == "key").Value);
+            Assert.Equal(1, v1SecretRecreation.Metadata.Annotations.Count);
+            Assert.True(v1SecretRecreation.Metadata.Annotations.Keys.Contains("key"));
+            Assert.Equal("value", v1SecretRecreation.Metadata.Annotations.First(x => x.Key == "key").Value);
+        }
+
         [Theory]
         [InlineData("updated-tls-KamusSecretV1Alpha2.yaml")]
         public async Task UpdateKamusSecret_SecretUpdated(string fileName)

tests/crd-controller/deployment.yaml

@@ -73,6 +73,7 @@ spec:
         image: crd-controller
         imagePullPolicy: IfNotPresent
         env:
+          Controller__ReconciliationIntervalInSeconds: 10
         livenessProbe:
           httpGet:
             path: /healthz