Fixed memory leak and cert-manager extension switch (#10)

Author: winromulus

ES.Kubernetes.Reflector.CertManager/CoreHealthCheck.cs renamed to ES.Kubernetes.Reflector.CertManager/CertManagerHealthCheck.cs

@@ -18,21 +18,17 @@ public class CertificatesMonitor : IHostedService,
         IRequestHandler<HealthCheckRequest<CertificatesMonitor>, bool>
     {
         private readonly BroadcastWatcher<Certificate, InternalCertificateWatcherEvent> _certificatesWatcher;
-        private readonly IKubernetes _client;
         private readonly ILogger<CertificatesMonitor> _logger;
         private readonly BroadcastWatcher<V1Secret, InternalSecretWatcherEvent> _secretsWatcher;
         private string _certificateResourceDefinitionVersion;
 
         public CertificatesMonitor(ILogger<CertificatesMonitor> logger,
             BroadcastWatcher<Certificate, InternalCertificateWatcherEvent> certificatesWatcher,
-            BroadcastWatcher<V1Secret, InternalSecretWatcherEvent> secretsWatcher,
-            IKubernetes client)
+            BroadcastWatcher<V1Secret, InternalSecretWatcherEvent> secretsWatcher)
         {
             _logger = logger;
             _certificatesWatcher = certificatesWatcher;
             _secretsWatcher = secretsWatcher;
-            _client = client;
-
 
             _secretsWatcher.OnBeforePublish = e =>
                 e.CertificateResourceDefinitionVersion = _certificateResourceDefinitionVersion;

ES.Kubernetes.Reflector.CertManager/CertificatesMonitor.cs

@@ -1,6 +1,9 @@
-using Autofac;
+using System;
+using Autofac;
 using ES.Kubernetes.Reflector.Core.Monitoring;
 using ES.Kubernetes.Reflector.Core.Monitors;
+using k8s;
+using Microsoft.Extensions.Logging;
 
 namespace ES.Kubernetes.Reflector.Core
 {
@@ -12,6 +15,21 @@ protected override void Load(ContainerBuilder builder)
             builder.RegisterGeneric(typeof(BroadcastWatcher<>));
 
 
+            builder.Register(s =>
+            {
+                var logger = s.Resolve<ILogger<CoreModule>>();
+                var inCluster = KubernetesClientConfiguration.IsInCluster();
+                logger.LogDebug("Building client configuration. Client is in cluster: '{inCluster}'", inCluster);
+
+                return inCluster
+                    ? KubernetesClientConfiguration.InClusterConfig()
+                    : KubernetesClientConfiguration.BuildConfigFromConfigFile();
+            }).As<KubernetesClientConfiguration>().SingleInstance();
+
+            builder.Register(s => new k8s.Kubernetes(s.Resolve<KubernetesClientConfiguration>())
+                {HttpClient = {Timeout = TimeSpan.FromMinutes(60)}}).As<k8s.Kubernetes>().As<IKubernetes>();
+
+
             builder.RegisterType<SecretsMonitor>().AsImplementedInterfaces().SingleInstance();
             builder.RegisterType<ConfigMapMonitor>().AsImplementedInterfaces().SingleInstance();
             builder.RegisterType<CustomResourceDefinitionsMonitor>().AsImplementedInterfaces().SingleInstance();

ES.Kubernetes.Reflector.Core/CoreModule.cs

@@ -11,6 +11,11 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Client\" />
   </ItemGroup>
 
 </Project>

ES.Kubernetes.Reflector.Core/ES.Kubernetes.Reflector.Core.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <RuntimeIdentifiers>linux-x64;linux-musl-x64;linux-arm</RuntimeIdentifiers>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
   </PropertyGroup>
 
   <ItemGroup>

ES.Kubernetes.Reflector/ES.Kubernetes.Reflector.csproj

@@ -1,11 +1,9 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using Autofac;
 using ES.Kubernetes.Reflector.CertManager;
 using ES.Kubernetes.Reflector.ConfigMaps;
 using ES.Kubernetes.Reflector.Core;
 using ES.Kubernetes.Reflector.Secrets;
-using k8s;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -19,8 +17,11 @@ namespace ES.Kubernetes.Reflector
 {
     public class Startup
     {
-        public Startup(IConfiguration configuration)
+        private readonly ILogger<Startup> _logger;
+
+        public Startup(IConfiguration configuration, ILogger<Startup> logger)
         {
+            _logger = logger;
             Configuration = configuration;
         }
 
@@ -36,21 +37,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddHealthChecks()
                 .AddCheck<CoreHealthCheck>("Core")
                 .AddCheck<CertManagerHealthCheck>("Extensions.CertManager");
-
-            services.AddSingleton(s =>
-            {
-                var logger = s.GetRequiredService<ILogger<Startup>>();
-                var inCluster = KubernetesClientConfiguration.IsInCluster();
-                logger.LogDebug("Building client configuration. Client is in cluster: '{inCluster}'", inCluster);
-
-                return inCluster
-                    ? KubernetesClientConfiguration.InClusterConfig()
-                    : KubernetesClientConfiguration.BuildConfigFromConfigFile();
-            });
-
-            services.AddTransient<IKubernetes>(s =>
-                new k8s.Kubernetes(s.GetRequiredService<KubernetesClientConfiguration>())
-                    {HttpClient = {Timeout = TimeSpan.FromMinutes(60)}});
         }
 
 
@@ -60,7 +46,10 @@ public void ConfigureContainer(ContainerBuilder builder)
             builder.RegisterModule<CoreModule>();
             builder.RegisterModule<SecretsModule>();
             builder.RegisterModule<ConfigMapsModule>();
-            builder.RegisterModule<CertManagerModule>();
+
+            var certManagerEnabled = bool.Parse(Configuration["Reflector:Extensions:CertManager:Enabled"]);
+            _logger.LogInformation("CertManager extension enabled: {certManagerEnabled}", certManagerEnabled);
+            if (certManagerEnabled) builder.RegisterModule<CertManagerModule>();
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)

ES.Kubernetes.Reflector/Startup.cs

@@ -18,9 +18,7 @@ rules:
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
     verbs: ["*"]
-  {{- if .Values.extensions.certManager.enabled }}
   - apiGroups: ["certmanager.k8s.io"]
     resources: ["certificates", "certificates/finalizers"]
     verbs: ["*"]
-  {{- end }}
 {{- end }}