Bumped KubernetesClient to v9.0.38 (#8249)

Author: cdemi

Directory.Build.props

@@ -131,7 +131,7 @@
     <ZooKeeperNetExVersion>3.4.12.4</ZooKeeperNetExVersion>
     <StackExchangeRedis>2.2.88</StackExchangeRedis>
     <Netstandard20KubernetesClientVersion>4.0.5</Netstandard20KubernetesClientVersion>
-    <KubernetesClientVersion>6.0.23</KubernetesClientVersion>
+    <KubernetesClientVersion>9.0.38</KubernetesClientVersion>
 
     <!-- Test related packages -->
     <FluentAssertionsVersion>6.2.0</FluentAssertionsVersion>

src/Orleans.Hosting.Kubernetes/KubernetesClientExtensions.cs

@@ -1,5 +1,9 @@
 using k8s;
+#if NETSTANDARD2_0
 using Microsoft.Rest;
+#else
+using k8s.Autorest;
+#endif
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;

src/Orleans.Hosting.Kubernetes/KubernetesClusterAgent.cs

@@ -215,11 +215,19 @@ private async Task MonitorKubernetesPods()
                         break;
                     }
 
+#if NETSTANDARD2_0
                     var pods = await _client.ListNamespacedPodWithHttpMessagesAsync(
                         namespaceParameter: _podNamespace,
                         labelSelector: _podLabelSelector,
                         watch: true,
                         cancellationToken: _shutdownToken.Token);
+#else
+                    var pods = await _client.CoreV1.ListNamespacedPodWithHttpMessagesAsync(
+                        namespaceParameter: _podNamespace,
+                        labelSelector: _podLabelSelector,
+                        watch: true,
+                        cancellationToken: _shutdownToken.Token);
+#endif
 
                     await foreach (var (eventType, pod) in pods.WatchAsync<V1PodList, V1Pod>(_shutdownToken.Token))
                     {

src/Orleans.Hosting.Kubernetes/KubernetesHostingExtensions.cs

@@ -1,10 +1,9 @@
-using k8s;
+using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Orleans.Configuration;
 using Orleans.Hosting.Kubernetes;
 using Orleans.Runtime;
-using System;
 
 namespace Orleans.Hosting
 {
@@ -50,25 +49,6 @@ public static IServiceCollection UseKubernetesHosting(this IServiceCollection se
 
             services.AddSingleton<ILifecycleParticipant<ISiloLifecycle>, KubernetesClusterAgent>();
 
-            // Configure the Kubernetes client.
-            services.AddHttpClient("Orleans.Kubernetes.Agent")
-                .AddTypedClient<IKubernetes>((httpClient, serviceProvider) =>
-                {
-                    var config = serviceProvider.GetRequiredService<KubernetesHostingOptions>().ClientConfiguration;
-                    return new k8s.Kubernetes(
-                        config,
-                        httpClient);
-                }).ConfigurePrimaryHttpMessageHandler(serviceProvider =>
-                {
-                    var config = serviceProvider.GetRequiredService<KubernetesHostingOptions>().ClientConfiguration;
-                    return config.CreateDefaultHttpClientHandler();
-                })
-#if NETSTANDARD2_0
-                .AddHttpMessageHandler(KubernetesClientConfiguration.CreateWatchHandler);
-#else
-                ;
-#endif
-
             return services;
         }
     }