Revert "Scoped and Namespaced Clients (#20)" (#21)

Author: pmdevers

src/K8sOperator.NET/Builder/EventWatcherBuilder.cs

@@ -1,5 +1,4 @@
-using K8sOperator.NET.Metadata;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace K8sOperator.NET.Builder;
 
@@ -8,15 +7,6 @@ internal class EventWatcherBuilder(IServiceProvider serviceProvider, IController
     public IEventWatcher Build()
     {
         var watcherType = typeof(EventWatcher<>).MakeGenericType(controller.ResourceType);
-        IKubernetesClient client = ActivatorUtilities.CreateInstance<NamespacedKubernetesClient>(serviceProvider);
-
-        var clientScope = controller.ResourceType.GetCustomAttributes(false).OfType<IEntityScopeMetadata>().FirstOrDefault();
-        if (clientScope?.Scope == EntityScope.Cluster)
-        { 
-            client = ActivatorUtilities.CreateInstance<ClusterKubernetesClient>(serviceProvider);
-        }
-
-        
-        return (IEventWatcher)ActivatorUtilities.CreateInstance(serviceProvider, watcherType, client, controller, metadata);
+        return (IEventWatcher)ActivatorUtilities.CreateInstance(serviceProvider, watcherType, controller, metadata);
     }
 }

src/K8sOperator.NET/Builder/OperatorHostBuilder.cs

@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 using System.Data.Common;
 using System.Reflection;
 
@@ -92,10 +91,7 @@ private void ConfigureMetadata()
         var dockerImage = Assembly.GetEntryAssembly()?.GetCustomAttribute<DockerImageAttribute>() 
             ?? DockerImageAttribute.Default;
 
-        var entityScope = Assembly.GetEntryAssembly()?.GetCustomAttribute<EntityScopeMetadata>()
-            ?? new EntityScopeMetadata(EntityScopeMetadata.Default);
-
-        _metadata.AddRange([operatorName, dockerImage, entityScope]);
+        _metadata.AddRange([operatorName, dockerImage]);
     }
     public IConfigurationManager Configuration => _configurationManager;
     public IServiceCollection Services => _serviceCollection;

src/K8sOperator.NET/EventWatcher.cs

@@ -1,5 +1,4 @@
 using k8s;
-using k8s.Autorest;
 using k8s.Models;
 using K8sOperator.NET.Extensions;
 using K8sOperator.NET.Metadata;
@@ -31,7 +30,7 @@ public interface IEventWatcher
     Task Start(CancellationToken cancellationToken);
 }
 
-internal class EventWatcher<T>(IKubernetesClient client, Controller<T> controller, List<object> metadata, ILoggerFactory loggerfactory) : IEventWatcher
+internal class EventWatcher<T>(IKubernetes client, Controller<T> controller, List<object> metadata, ILoggerFactory loggerfactory) : IEventWatcher
     where T: CustomResource
 {
     private KubernetesEntityAttribute Crd => Metadata.OfType<KubernetesEntityAttribute>().First();
@@ -44,7 +43,7 @@ internal class EventWatcher<T>(IKubernetesClient client, Controller<T> controlle
     private CancellationToken _cancellationToken = CancellationToken.None;
     private readonly Controller<T> _controller = controller;
 
-    public IKubernetesClient Client { get; } = client;
+    public IKubernetes Client { get; } = client;
     public ILogger Logger { get; } = loggerfactory.CreateLogger("watcher");
     public IReadOnlyList<object> Metadata { get; } = metadata;
     public IController Controller => _controller;
@@ -54,7 +53,17 @@ public async Task Start(CancellationToken cancellationToken)
         _cancellationToken = cancellationToken;
         _isRunning = true;
 
-        var response = Client.ListAsync<T>(LabelSelector, cancellationToken);
+        var response = Client.CustomObjects.ListNamespacedCustomObjectWithHttpMessagesAsync(
+            Crd.Group,
+            Crd.ApiVersion,
+            Namespace,
+            Crd.PluralName,
+            watch: true,
+            allowWatchBookmarks: true,
+            labelSelector: LabelSelector,
+            timeoutSeconds: (int)TimeSpan.FromMinutes(60).TotalSeconds,
+            cancellationToken: cancellationToken
+        );
 
         Logger.BeginWatch(Namespace, Crd.PluralName, LabelSelector);
 
@@ -65,7 +74,6 @@ public async Task Start(CancellationToken cancellationToken)
 
         Logger.EndWatch(Namespace, Crd.PluralName, LabelSelector);
     }
-    
 
     private void OnEvent(WatchEventType eventType, T customResource)
     {
@@ -198,7 +206,15 @@ private async Task<T> ReplaceAsync(T resource, CancellationToken cancellationTok
         Logger.ReplaceResource(resource);
 
         // Replace the resource
-        var result = await Client.ReplaceAsync(resource, cancellationToken);
+        var result = await Client.CustomObjects.ReplaceNamespacedCustomObjectAsync<T>(
+            resource,
+            Crd.Group,
+            Crd.ApiVersion,
+            resource.Metadata.NamespaceProperty,
+            Crd.PluralName,
+            resource.Metadata.Name,
+            cancellationToken: cancellationToken
+        ).ConfigureAwait(false);
 
         return result;
     }

src/K8sOperator.NET/Extensions/KubernetesBuilderExtensions.cs

@@ -15,20 +15,18 @@ public static class KubernetesBuilderExtensions
     /// <returns></returns>
     public static IServiceCollection AddKubernetes(this IServiceCollection services)
     {
-        services.AddTransient<IKubernetes>(x => {
-            KubernetesClientConfiguration config;
+        KubernetesClientConfiguration config;
 
-            if (KubernetesClientConfiguration.IsInCluster())
-            {
-                config = KubernetesClientConfiguration.InClusterConfig();
-            }
-            else
-            {
-                config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
-            }
-        
-            return new Kubernetes(config);
-        });
+        if (KubernetesClientConfiguration.IsInCluster())
+        {
+            config = KubernetesClientConfiguration.InClusterConfig();
+        }
+        else
+        {
+            config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
+        }
+
+        services.AddSingleton<IKubernetes>(new Kubernetes(config));
 
         return services;
     }

src/K8sOperator.NET/Extensions/MetaDataExtensions.cs

@@ -61,12 +61,7 @@ public static TBuilder WithGroup<TBuilder>(this TBuilder builder,
     public static TBuilder WatchNamespace<TBuilder>(this TBuilder builder, string watchNamespace)
         where TBuilder : IControllerConventionBuilder
     {
-        builder.Finally(x => {
-            x.Metadata.RemoveAll(x => x.GetType() == typeof(WatchNamespaceMetadata));
-            x.Metadata.RemoveAll(x => x.GetType() == typeof(EntityScopeMetadata));
-            x.Metadata.Add(new WatchNamespaceMetadata(watchNamespace));
-            x.Metadata.Add(new EntityScopeMetadata(EntityScope.Namespaced));
-        });
+        builder.WithSingle(new WatchNamespaceMetadata(watchNamespace));
         return builder;
     }
 

src/K8sOperator.NET/K8sOperator.NET.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <UserSecretsId>75af4ad7-a38b-4759-92a0-fa12fc4f56dd</UserSecretsId>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="KubernetesClient" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />

src/K8sOperator.NET/KubernetesClient.cs

@@ -33,7 +33,7 @@ public interface IEntityScopeMetadata
 /// Sets the scope of the entity.
 /// </summary>
 /// <param name="scope"></param>
-[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
 public class EntityScopeMetadata(EntityScope scope) : Attribute, IEntityScopeMetadata
 {
     /// <summary>