Support v1beta1 version of CRDs in apiextensions.k8s.io (#30)

Added timed updates for the older versions of CRDs Should support kubernetes 1.14.8+
emberstack · Apr 7, 2020 · 1da7e61 · 1da7e61
1 parent ac44c6f
commit 1da7e61
Show file tree

Hide file tree

Showing 45 changed files with 123 additions and 76 deletions.
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
@@ -1,7 +1,7 @@
 name: $(version).$(Rev:r)
 
 variables:
-  version: 4.1
+  version: 4.2
   buildConfiguration: "Release"
   imageRepository: "emberstack/kubernetes-reflector"
   DOCKER_CLI_EXPERIMENTAL: 'enabled'
@@ -10,6 +10,9 @@ trigger:
   branches:
     include:
       - "*"
+  paths:
+    include:
+    - src/*
 
 stages:
 
@@ -31,14 +34,14 @@ stages:
 
           - task: HelmInstaller@1
             inputs:
-              helmVersionToInstall: 'latest'
+              helmVersionToInstall: '3.1.1'
 
           - script: |
-             helm package --destination $(Build.ArtifactStagingDirectory)/artifacts/helm --version $(Build.BuildNumber) --app-version $(Build.BuildNumber) helm/reflector
+             helm package --destination $(Build.ArtifactStagingDirectory)/artifacts/helm --version $(Build.BuildNumber) --app-version $(Build.BuildNumber) src/helm/reflector
             displayName: 'helm package'
 
           - script: 'helm template --namespace kube-system reflector reflector > $(Build.ArtifactStagingDirectory)/artifacts/kubectl/reflector-$(Build.BuildNumber).yaml'
-            workingDirectory: helm
+            workingDirectory: src/helm
             displayName: 'helm template'
 
           - publish: '$(Build.ArtifactStagingDirectory)/artifacts/helm'
@@ -81,9 +84,9 @@ stages:
             inputs: 
               containerRegistry: 'Emberstack Docker Hub' 
               repository: $(imageRepository) 
-              Dockerfile: ES.Kubernetes.Reflector.Host/Dockerfile 
+              Dockerfile: src/ES.Kubernetes.Reflector.Host/Dockerfile 
               command: build 
-              buildContext: . 
+              buildContext: src 
               tags: 'build-$(Build.BuildNumber)-arm32' 
 
           - task: Docker@2 
@@ -112,9 +115,9 @@ stages:
             inputs:
               containerRegistry: 'Emberstack Docker Hub'
               repository: $(imageRepository)
-              Dockerfile: ES.Kubernetes.Reflector.Host/Dockerfile
+              Dockerfile: src/ES.Kubernetes.Reflector.Host/Dockerfile
               command: build
-              buildContext: .
+              buildContext: src
               tags: 'build-$(Build.BuildNumber)-amd64'
 
           - task: Docker@2
@@ -188,7 +191,7 @@ stages:
 
           - task: HelmInstaller@1
             inputs:
-              helmVersionToInstall: 'latest'   
+              helmVersionToInstall: '3.1.1'   
 
           - script: |
               docker pull $(imageRepository):build-$(Build.BuildNumber)-amd64

diff --git a/samples/helm/reflector-sample/templates/certificate.yaml b/samples/helm/reflector-sample/templates/certificate.yaml
@@ -1,6 +1,6 @@
-apiVersion: certmanager.k8s.io/v1alpha1
+apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
-metadata:  
+metadata:
   name: {{ template "reflector-sample.fullname" $ }}-cert
   annotations:
     reflector.v1.k8s.emberstack.com/secret-reflection-allowed: "true"
@@ -11,10 +11,4 @@ spec:
     name: {{ template "reflector-sample.fullname" $ }}-someissuer
     kind: ClusterIssuer
   dnsNames:
-    - '*.dev.winromulus.com'
-  acme:
-    config:      
-      - dns01:
-          provider: someprovider
-        domains:
-          - '*.dev.winromulus.com'
+  - '*.dev.winromulus.com'
diff --git a/...eflector.CertManager/CertManagerModule.cs → ...eflector.CertManager/CertManagerModule.cs b/...eflector.CertManager/CertManagerModule.cs → ...eflector.CertManager/CertManagerModule.cs
diff --git a/...Manager/Constants/CertManagerConstants.cs → ...Manager/Constants/CertManagerConstants.cs b/...Manager/Constants/CertManagerConstants.cs → ...Manager/Constants/CertManagerConstants.cs
diff --git a/...S.Kubernetes.Reflector.CertManager.csproj → ...S.Kubernetes.Reflector.CertManager.csproj b/...S.Kubernetes.Reflector.CertManager.csproj → ...S.Kubernetes.Reflector.CertManager.csproj
diff --git a/...Events/InternalCertificateWatcherEvent.cs → ...Events/InternalCertificateWatcherEvent.cs b/...Events/InternalCertificateWatcherEvent.cs → ...Events/InternalCertificateWatcherEvent.cs
diff --git a/...ager/Events/InternalSecretWatcherEvent.cs → ...ager/Events/InternalSecretWatcherEvent.cs b/...ager/Events/InternalSecretWatcherEvent.cs → ...ager/Events/InternalSecretWatcherEvent.cs
diff --git a/...bernetes.Reflector.CertManager/Monitor.cs → ...bernetes.Reflector.CertManager/Monitor.cs b/...bernetes.Reflector.CertManager/Monitor.cs → ...bernetes.Reflector.CertManager/Monitor.cs
@@ -19,6 +19,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Rest;
+using Timer = System.Timers.Timer;
 
 namespace ES.Kubernetes.Reflector.CertManager
 {
@@ -29,22 +30,26 @@ public class Monitor : IHostedService, IHealthCheck
         private readonly Dictionary<string, ManagedWatcher<Certificate, object>> _certificatesWatchers =
             new Dictionary<string, ManagedWatcher<Certificate, object>>();
 
-        private readonly ManagedWatcher<V1CustomResourceDefinition, V1CustomResourceDefinitionList> _crdWatcher;
+        private readonly ManagedWatcher<V1CustomResourceDefinition, V1CustomResourceDefinitionList> _crdV1Watcher;
+
         private readonly FeederQueue<WatcherEvent> _eventQueue;
         private readonly ILogger<Monitor> _logger;
         private readonly IMediator _mediator;
         private readonly ManagedWatcher<V1Secret, V1SecretList> _secretsWatcher;
         private readonly IKubernetes _apiClient;
 
+        private readonly Timer _v1Beta1CrdMonitorTimer = new Timer();
+        private bool _v1Beta1CrdMonitorTimerFaulted;
+
         public Monitor(ILogger<Monitor> logger,
-            ManagedWatcher<V1CustomResourceDefinition, V1CustomResourceDefinitionList> crdWatcher,
+            ManagedWatcher<V1CustomResourceDefinition, V1CustomResourceDefinitionList> crdV1Watcher,
             Func<ManagedWatcher<Certificate, object>> certificatesWatcherFactory,
             ManagedWatcher<V1Secret, V1SecretList> secretsWatcher,
             IKubernetes apiClient,
             IMediator mediator)
         {
             _logger = logger;
-            _crdWatcher = crdWatcher;
+            _crdV1Watcher = crdV1Watcher;
             _certificatesWatcherFactory = certificatesWatcherFactory;
             _secretsWatcher = secretsWatcher;
             _apiClient = apiClient;
@@ -65,34 +70,22 @@ public Monitor(ILogger<Monitor> logger,
                 await c.ListSecretForAllNamespacesWithHttpMessagesAsync(watch: true);
 
 
-            _crdWatcher.EventHandlerFactory = OnCrdEvent;
-            _crdWatcher.RequestFactory = async c =>
+            _crdV1Watcher.EventHandlerFactory = OnCrdEventV1;
+            _crdV1Watcher.RequestFactory = async c =>
                 await c.ListCustomResourceDefinitionWithHttpMessagesAsync(watch: true);
-            _crdWatcher.OnStateChanged = async (sender, update) =>
-            {
-                switch (update.State)
-                {
-                    case ManagedWatcherState.Closed:
-                        _logger.LogDebug("{type} watcher {state}", typeof(V1CustomResourceDefinition).Name,
-                            update.State);
-                        await sender.Start();
-                        break;
-                    case ManagedWatcherState.Faulted:
-                        _logger.LogError(update.Exception, "{type} watcher {state}",
-                            typeof(V1CustomResourceDefinition).Name, update.State);
-                        break;
-                    default:
-                        _logger.LogDebug("{type} watcher {state}", typeof(V1CustomResourceDefinition).Name,
-                            update.State);
-                        break;
-                }
-            };
+            _crdV1Watcher.OnStateChanged = OnCrdWatcherStateChanged;
+
+            _v1Beta1CrdMonitorTimer.Elapsed += (_,__)=> Onv1Beta1CrdRefresh();
+            _v1Beta1CrdMonitorTimer.Interval = 30_000;
         }
 
+
         public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context,
             CancellationToken cancellationToken = new CancellationToken())
         {
-            return Task.FromResult(_crdWatcher.IsFaulted || _secretsWatcher.IsFaulted ||
+            return Task.FromResult(_crdV1Watcher.IsFaulted ||
+                                   _v1Beta1CrdMonitorTimerFaulted ||
+                                   _secretsWatcher.IsFaulted ||
                                    _certificatesWatchers.Values.Any(s => s.IsFaulted)
                 ? HealthCheckResult.Unhealthy()
                 : HealthCheckResult.Healthy());
@@ -103,31 +96,94 @@ public async Task StartAsync(CancellationToken cancellationToken)
             try
             {
                 await _apiClient.ListCustomResourceDefinitionAsync(cancellationToken: cancellationToken);
-                await _crdWatcher.Start();
+                await _crdV1Watcher.Start();
             }
             catch (HttpOperationException exception) when (exception.Response.StatusCode == HttpStatusCode.NotFound)
             {
-                _logger.LogError(
+                _logger.LogWarning(
                     "Current kubernetes version does not support {type} apiVersion {version}.",
                     V1CustomResourceDefinition.KubeKind, V1CustomResourceDefinition.KubeApiVersion);
+                Onv1Beta1CrdRefresh();
+                _v1Beta1CrdMonitorTimer.Start();
             }
         }
 
         public async Task StopAsync(CancellationToken cancellationToken)
         {
-            await _crdWatcher.Stop();
+            await _crdV1Watcher.Stop();
             foreach (var certificatesWatcher in _certificatesWatchers.Values) await certificatesWatcher.Stop();
             await _secretsWatcher.Stop();
         }
 
-        private async Task OnWatcherStateChanged<TS, TSL>(ManagedWatcher<TS, TSL, WatcherEvent<TS>> sender,
-            ManagedWatcherStateUpdate update) where TS : class, IKubernetesObject
+        private void Onv1Beta1CrdRefresh()
+        {
+            try
+            {
+                _logger.LogDebug(
+                    "Updating {type} {kind} in group {group}",
+                    typeof(V1beta1CustomResourceDefinition).Name,
+                    CertManagerConstants.CertificateKind, CertManagerConstants.CrdGroup);
+
+                _v1Beta1CrdMonitorTimerFaulted = false;
+                var crd = _apiClient.ListCustomResourceDefinition1().Items
+                    .FirstOrDefault(s =>
+                        s.Spec?.Names != null && s.Spec.Group == CertManagerConstants.CrdGroup &&
+                        s.Spec.Names.Kind == CertManagerConstants.CertificateKind);
+
+                if (crd == null) return;
+                OnCrdVersionUpdate(crd.GetType().Name, crd.Spec.Names.Kind,
+                    crd.Spec.Group, crd.Spec.Names.Plural, crd.Spec.Versions.Select(s => s.Name).ToList()).Wait();
+
+
+            }
+            catch (HttpOperationException exception) when (exception.Response.StatusCode == HttpStatusCode.NotFound)
+            {
+                _logger.LogWarning(
+                    "Current kubernetes version does not support {type} apiVersion {version}.",
+                    V1beta1CustomResourceDefinition.KubeKind, V1beta1CustomResourceDefinition.KubeApiVersion);
+
+                _v1Beta1CrdMonitorTimer.Stop();
+            }
+            catch (Exception exception)
+            {
+                _v1Beta1CrdMonitorTimerFaulted = true;
+                _v1Beta1CrdMonitorTimer.Stop();
+                _logger.LogError(exception,
+                    "Error occured while getting {kind} version {version}",
+                    V1beta1CustomResourceDefinition.KubeKind, V1beta1CustomResourceDefinition.KubeApiVersion);
+            }
+
+
+        }
+
+        private async Task OnCrdWatcherStateChanged<TResource, TResourceList>(
+            ManagedWatcher<TResource, TResourceList, WatcherEvent<TResource>> sender, ManagedWatcherStateUpdate update)
+            where TResource : class, IKubernetesObject
+        {
+            switch (update.State)
+            {
+                case ManagedWatcherState.Closed:
+                    _logger.LogDebug("{type} watcher {state}", typeof(TResource).Name, update.State);
+                    await sender.Start();
+                    break;
+                case ManagedWatcherState.Faulted:
+                    _logger.LogError(update.Exception, "{type} watcher {state}",
+                        typeof(TResource).Name, update.State);
+                    break;
+                default:
+                    _logger.LogDebug("{type} watcher {state}", typeof(TResource).Name, update.State);
+                    break;
+            }
+        }
+
+        private async Task OnWatcherStateChanged<TResource, TResourceList>(ManagedWatcher<TResource, TResourceList, WatcherEvent<TResource>> sender,
+            ManagedWatcherStateUpdate update) where TResource : class, IKubernetesObject
         {
             var tag = sender.Tag ?? string.Empty;
             switch (update.State)
             {
                 case ManagedWatcherState.Closed:
-                    _logger.LogDebug("{type} watcher {tag} {state}", typeof(TS).Name, tag, update.State);
+                    _logger.LogDebug("{type} watcher {tag} {state}", typeof(TResource).Name, tag, update.State);
                     await _secretsWatcher.Stop();
                     foreach (var certificatesWatcher in _certificatesWatchers.Values) await certificatesWatcher.Stop();
 
@@ -137,11 +193,11 @@ private async Task OnWatcherStateChanged<TS, TSL>(ManagedWatcher<TS, TSL, Watche
                     foreach (var certificatesWatcher in _certificatesWatchers.Values) await certificatesWatcher.Start();
                     break;
                 case ManagedWatcherState.Faulted:
-                    _logger.LogError(update.Exception, "{type} watcher {tag} {state}", typeof(TS).Name, tag,
+                    _logger.LogError(update.Exception, "{type} watcher {tag} {state}", typeof(TResource).Name, tag,
                         update.State);
                     break;
                 default:
-                    _logger.LogDebug("{type} watcher {tag} {state}", typeof(TS).Name, tag, update.State);
+                    _logger.LogDebug("{type} watcher {tag} {state}", typeof(TResource).Name, tag, update.State);
                     break;
             }
         }
@@ -169,7 +225,7 @@ private async Task OnEventHandlingError(WatcherEvent e, Exception ex)
         }
 
 
-        private async Task OnCrdEvent(WatcherEvent<V1CustomResourceDefinition> request)
+        private async Task OnCrdEventV1(WatcherEvent<V1CustomResourceDefinition> request)
         {
             if (request.Type != WatchEventType.Added && request.Type != WatchEventType.Modified) return;
             if (request.Item.Spec?.Names == null) return;
@@ -179,11 +235,16 @@ private async Task OnCrdEvent(WatcherEvent<V1CustomResourceDefinition> request)
             var versions = request.Item.Spec.Versions.Select(s => s.Name).ToList();
             if (versions.TrueForAll(s => _certificatesWatchers.ContainsKey(s))) return;
 
+            await OnCrdVersionUpdate(request.Item.GetType().Name, request.Item.Spec.Names.Kind, request.Item.Spec.Group,
+                request.Item.Spec.Names.Plural, versions);
+        }
+
+        private async Task OnCrdVersionUpdate(string crdType, string crdKind, string crdGroup, string crdPlural, List<string> versions)
+        {
+            if (versions.TrueForAll(s => _certificatesWatchers.ContainsKey(s))) return;
+
             _logger.LogInformation("{crdType} {kind} in group {group} versions updated to {versions}",
-                request.Item.GetType().Name,
-                request.Item.Spec.Names.Kind,
-                request.Item.Spec.Group,
-                versions);
+                crdType, crdKind, crdGroup, versions);
 
             foreach (var certificatesWatcher in _certificatesWatchers.Values) await certificatesWatcher.Stop();
             await _secretsWatcher.Stop();
@@ -198,8 +259,7 @@ private async Task OnCrdEvent(WatcherEvent<V1CustomResourceDefinition> request)
                 watcher.EventHandlerFactory = e =>
                     _eventQueue.FeedAsync(new InternalCertificateWatcherEvent { Item = e.Item, Type = e.Type });
                 watcher.RequestFactory = async client => await client.ListClusterCustomObjectWithHttpMessagesAsync(
-                    request.Item.Spec.Group,
-                    version, request.Item.Spec.Names.Plural, watch: true,
+                    crdGroup, version, crdPlural, watch: true,
                     timeoutSeconds: (int)TimeSpan.FromHours(1).TotalSeconds);
                 _certificatesWatchers.Add(version, watcher);
             }

diff --git a/...ctor.CertManager/Resources/Certificate.cs → ...ctor.CertManager/Resources/Certificate.cs b/...ctor.CertManager/Resources/Certificate.cs → ...ctor.CertManager/Resources/Certificate.cs
diff --git a/...tes.Reflector.CertManager/SecretEtcher.cs → ...tes.Reflector.CertManager/SecretEtcher.cs b/...tes.Reflector.CertManager/SecretEtcher.cs → ...tes.Reflector.CertManager/SecretEtcher.cs
diff --git a/....Reflector.ConfigMaps/ConfigMapsModule.cs → ....Reflector.ConfigMaps/ConfigMapsModule.cs b/....Reflector.ConfigMaps/ConfigMapsModule.cs → ....Reflector.ConfigMaps/ConfigMapsModule.cs
diff --git a/...ES.Kubernetes.Reflector.ConfigMaps.csproj → ...ES.Kubernetes.Reflector.ConfigMaps.csproj b/...ES.Kubernetes.Reflector.ConfigMaps.csproj → ...ES.Kubernetes.Reflector.ConfigMaps.csproj
diff --git a/ES.Kubernetes.Reflector.ConfigMaps/Mirror.cs → ...Kubernetes.Reflector.ConfigMaps/Mirror.cs b/ES.Kubernetes.Reflector.ConfigMaps/Mirror.cs → ...Kubernetes.Reflector.ConfigMaps/Mirror.cs
diff --git a/...s.Reflector.Core/Constants/Annotations.cs → ...s.Reflector.Core/Constants/Annotations.cs b/...s.Reflector.Core/Constants/Annotations.cs → ...s.Reflector.Core/Constants/Annotations.cs
diff --git a/ES.Kubernetes.Reflector.Core/CoreModule.cs → ...S.Kubernetes.Reflector.Core/CoreModule.cs b/ES.Kubernetes.Reflector.Core/CoreModule.cs → ...S.Kubernetes.Reflector.Core/CoreModule.cs
diff --git a/....Core/ES.Kubernetes.Reflector.Core.csproj → ....Core/ES.Kubernetes.Reflector.Core.csproj b/....Core/ES.Kubernetes.Reflector.Core.csproj → ....Core/ES.Kubernetes.Reflector.Core.csproj
@@ -6,13 +6,13 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="5.1.2" />
-    <PackageReference Include="KubernetesClient" Version="1.6.21" />
+    <PackageReference Include="KubernetesClient" Version="1.6.33" />
     <PackageReference Include="MediatR" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.3" />
   </ItemGroup>
 
 </Project>
diff --git a/...tes.Reflector.Core/Events/WatcherEvent.cs → ...tes.Reflector.Core/Events/WatcherEvent.cs b/...tes.Reflector.Core/Events/WatcherEvent.cs → ...tes.Reflector.Core/Events/WatcherEvent.cs
diff --git a/...tor.Core/Extensions/MetadataExtensions.cs → ...tor.Core/Extensions/MetadataExtensions.cs b/...tor.Core/Extensions/MetadataExtensions.cs → ...tor.Core/Extensions/MetadataExtensions.cs
diff --git a/...or.Core/Health/HealthBuilderExtensions.cs → ...or.Core/Health/HealthBuilderExtensions.cs b/...or.Core/Health/HealthBuilderExtensions.cs → ...or.Core/Health/HealthBuilderExtensions.cs
diff --git a/...eflector.Core/Mirroring/ResourceMirror.cs → ...eflector.Core/Mirroring/ResourceMirror.cs b/...eflector.Core/Mirroring/ResourceMirror.cs → ...eflector.Core/Mirroring/ResourceMirror.cs
diff --git a/...flector.Core/Monitoring/ManagedWatcher.cs → ...flector.Core/Monitoring/ManagedWatcher.cs b/...flector.Core/Monitoring/ManagedWatcher.cs → ...flector.Core/Monitoring/ManagedWatcher.cs
diff --git a/...or.Core/Monitoring/ManagedWatcherState.cs → ...or.Core/Monitoring/ManagedWatcherState.cs b/...or.Core/Monitoring/ManagedWatcherState.cs → ...or.Core/Monitoring/ManagedWatcherState.cs
diff --git a/...e/Monitoring/ManagedWatcherStateUpdate.cs → ...e/Monitoring/ManagedWatcherStateUpdate.cs b/...e/Monitoring/ManagedWatcherStateUpdate.cs → ...e/Monitoring/ManagedWatcherStateUpdate.cs
diff --git a/...tes.Reflector.Core/Queuing/FeederQueue.cs → ...tes.Reflector.Core/Queuing/FeederQueue.cs b/...tes.Reflector.Core/Queuing/FeederQueue.cs → ...tes.Reflector.Core/Queuing/FeederQueue.cs
diff --git a/...ctor.Core/Resources/KubernetesObjectId.cs → ...ctor.Core/Resources/KubernetesObjectId.cs b/...ctor.Core/Resources/KubernetesObjectId.cs → ...ctor.Core/Resources/KubernetesObjectId.cs
diff --git a/ES.Kubernetes.Reflector.Host/Dockerfile → src/ES.Kubernetes.Reflector.Host/Dockerfile b/ES.Kubernetes.Reflector.Host/Dockerfile → src/ES.Kubernetes.Reflector.Host/Dockerfile
diff --git a/....Host/ES.Kubernetes.Reflector.Host.csproj → ....Host/ES.Kubernetes.Reflector.Host.csproj b/....Host/ES.Kubernetes.Reflector.Host.csproj → ....Host/ES.Kubernetes.Reflector.Host.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="KubernetesClient" Version="1.6.21" />
+    <PackageReference Include="KubernetesClient" Version="1.6.33" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
     <PackageReference Include="Serilog" Version="2.9.0" />

diff --git a/ES.Kubernetes.Reflector.Host/Program.cs → src/ES.Kubernetes.Reflector.Host/Program.cs b/ES.Kubernetes.Reflector.Host/Program.cs → src/ES.Kubernetes.Reflector.Host/Program.cs
diff --git a/ES.Kubernetes.Reflector.Host/Startup.cs → src/ES.Kubernetes.Reflector.Host/Startup.cs b/ES.Kubernetes.Reflector.Host/Startup.cs → src/ES.Kubernetes.Reflector.Host/Startup.cs
diff --git a/...Reflector.Host/reflector.appsettings.json → ...Reflector.Host/reflector.appsettings.json b/...Reflector.Host/reflector.appsettings.json → ...Reflector.Host/reflector.appsettings.json
diff --git a/...tes.Reflector.Host/reflector.logging.json → ...tes.Reflector.Host/reflector.logging.json b/...tes.Reflector.Host/reflector.logging.json → ...tes.Reflector.Host/reflector.logging.json
diff --git a/...ts/ES.Kubernetes.Reflector.Secrets.csproj → ...ts/ES.Kubernetes.Reflector.Secrets.csproj b/...ts/ES.Kubernetes.Reflector.Secrets.csproj → ...ts/ES.Kubernetes.Reflector.Secrets.csproj
diff --git a/...bernetes.Reflector.Secrets/FortiMirror.cs → ...bernetes.Reflector.Secrets/FortiMirror.cs b/...bernetes.Reflector.Secrets/FortiMirror.cs → ...bernetes.Reflector.Secrets/FortiMirror.cs
@@ -57,17 +57,7 @@ public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context,
 
         public async Task StartAsync(CancellationToken cancellationToken)
         {
-            try
-            {
-                await _apiClient.ListCustomResourceDefinitionAsync(cancellationToken: cancellationToken);
-                await _secretsWatcher.Start();
-            }
-            catch (HttpOperationException exception) when (exception.Response.StatusCode == HttpStatusCode.NotFound)
-            {
-                _logger.LogError(
-                    "Current kubernetes version does not support {type} apiVersion {version}.",
-                    V1CustomResourceDefinition.KubeKind, V1CustomResourceDefinition.KubeApiVersion);
-            }
+            await _secretsWatcher.Start();
         }
 
         public async Task StopAsync(CancellationToken cancellationToken)

diff --git a/ES.Kubernetes.Reflector.Secrets/Mirror.cs → ...ES.Kubernetes.Reflector.Secrets/Mirror.cs b/ES.Kubernetes.Reflector.Secrets/Mirror.cs → ...ES.Kubernetes.Reflector.Secrets/Mirror.cs
diff --git a/...rnetes.Reflector.Secrets/SecretsModule.cs → ...rnetes.Reflector.Secrets/SecretsModule.cs b/...rnetes.Reflector.Secrets/SecretsModule.cs → ...rnetes.Reflector.Secrets/SecretsModule.cs
diff --git a/helm/reflector/.helmignore → src/helm/reflector/.helmignore b/helm/reflector/.helmignore → src/helm/reflector/.helmignore
diff --git a/helm/reflector/Chart.yaml → src/helm/reflector/Chart.yaml b/helm/reflector/Chart.yaml → src/helm/reflector/Chart.yaml
diff --git a/helm/reflector/README.md → src/helm/reflector/README.md b/helm/reflector/README.md → src/helm/reflector/README.md
diff --git a/helm/reflector/templates/NOTES.txt → src/helm/reflector/templates/NOTES.txt b/helm/reflector/templates/NOTES.txt → src/helm/reflector/templates/NOTES.txt
diff --git a/helm/reflector/templates/_helpers.tpl → src/helm/reflector/templates/_helpers.tpl b/helm/reflector/templates/_helpers.tpl → src/helm/reflector/templates/_helpers.tpl
diff --git a/helm/reflector/templates/deployment.yaml → src/helm/reflector/templates/deployment.yaml b/helm/reflector/templates/deployment.yaml → src/helm/reflector/templates/deployment.yaml
diff --git a/...reflector/templates/rbac-clusterRole.yaml → ...reflector/templates/rbac-clusterRole.yaml b/...reflector/templates/rbac-clusterRole.yaml → ...reflector/templates/rbac-clusterRole.yaml
diff --git a/...or/templates/rbac-clusterRoleBinding.yaml → ...or/templates/rbac-clusterRoleBinding.yaml b/...or/templates/rbac-clusterRoleBinding.yaml → ...or/templates/rbac-clusterRoleBinding.yaml
diff --git a/...lector/templates/rbac-serviceAccount.yaml → ...lector/templates/rbac-serviceAccount.yaml b/...lector/templates/rbac-serviceAccount.yaml → ...lector/templates/rbac-serviceAccount.yaml
diff --git a/helm/reflector/values.yaml → src/helm/reflector/values.yaml b/helm/reflector/values.yaml → src/helm/reflector/values.yaml