feat(KubernetesJson): Use of SourceGenerationContext outside AOT

src/KubernetesClient.Aot/KubernetesClient.Aot.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
@@ -43,7 +43,11 @@
     <Compile Include="..\KubernetesClient\Models\V1Patch.cs" />
     <Compile Include="..\KubernetesClient\Models\V1PodTemplateSpec.cs" />
     <Compile Include="..\KubernetesClient\Models\V1Status.cs" />
-
+    <Compile Include="..\KubernetesClient\KubernetesJson.cs" />
+    <Compile Include="..\KubernetesClient\SourceGenerationContext.cs" />
+    <Compile Include="..\KubernetesClient\Models\V1Status.ObjectView.cs" />
+    <Compile Include="..\KubernetesClient\Models\KubernetesDateTimeOffsetYamlConverter.cs" />
+    <Compile Include="..\KubernetesClient\Models\KubernetesDateTimeYamlConverter.cs" />
   </ItemGroup>
   <ItemGroup>
       <Compile Include="..\KubernetesClient\ClientSets\ClientSet.cs" />

src/KubernetesClient.Aot/KubernetesYaml.cs

@@ -17,6 +17,8 @@ internal static class KubernetesYaml
                 .WithTypeConverter(new IntOrStringYamlConverter())
                 .WithTypeConverter(new ByteArrayStringYamlConverter())
                 .WithTypeConverter(new ResourceQuantityYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeOffsetYamlConverter())
                 .WithAttemptingUnquotedStringTypeDeserialization()
                 ;
 
@@ -33,6 +35,8 @@ internal static class KubernetesYaml
                 .WithTypeConverter(new IntOrStringYamlConverter())
                 .WithTypeConverter(new ByteArrayStringYamlConverter())
                 .WithTypeConverter(new ResourceQuantityYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeOffsetYamlConverter())
                 .WithEventEmitter(e => new StringQuotingEmitter(e))
                 .WithEventEmitter(e => new FloatEmitter(e))
                 .ConfigureDefaultValuesHandling(DefaultValuesHandling.OmitNull)
@@ -56,7 +60,7 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria
                             return null;
                         }
 
-                        return Encoding.UTF8.GetBytes(scalar.Value);
+                        return Convert.FromBase64String(scalar.Value);
                     }
                     finally
                     {
@@ -69,8 +73,15 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria
 
             public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)
             {
+                if (value == null)
+                {
+                    emitter.Emit(new Scalar(string.Empty));
+                    return;
+                }
+
                 var obj = (byte[])value;
-                emitter?.Emit(new Scalar(Encoding.UTF8.GetString(obj)));
+                var encoded = Convert.ToBase64String(obj);
+                emitter.Emit(new Scalar(encoded));
             }
         }
 

src/KubernetesClient.Classic/KubernetesClient.Classic.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
@@ -49,6 +49,9 @@
     <Compile Include="..\KubernetesClient\Models\V1PodTemplateSpec.cs" />
     <Compile Include="..\KubernetesClient\Models\V1Status.cs" />
     <Compile Include="..\KubernetesClient\Models\V1Status.ObjectView.cs" />
+    <Compile Include="..\KubernetesClient\Models\KubernetesDateTimeOffsetYamlConverter.cs" />
+    <Compile Include="..\KubernetesClient\Models\KubernetesDateTimeYamlConverter.cs" />
+
 
     <Compile Include="..\KubernetesClient\KubeConfigModels\ClusterEndpoint.cs" />
     <Compile Include="..\KubernetesClient\KubeConfigModels\Context.cs" />

src/KubernetesClient/KubernetesJson.cs

@@ -3,13 +3,17 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 
+#if NET8_0_OR_GREATER
+using System.Text.Json.Serialization.Metadata;
+#endif
+
 namespace k8s
 {
     public static class KubernetesJson
     {
-        private static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions();
+        internal static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions();
 
-        private sealed class Iso8601TimeSpanConverter : JsonConverter<TimeSpan>
+        public sealed class Iso8601TimeSpanConverter : JsonConverter<TimeSpan>
         {
             public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             {
@@ -20,15 +24,15 @@
             public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
             {
                 var iso8601TimeSpanString = XmlConvert.ToString(value); // XmlConvert for TimeSpan uses ISO8601, so delegate serialization to it
                 writer.WriteStringValue(iso8601TimeSpanString);
             }
         }
 
-        private sealed class KubernetesDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
+        public sealed class KubernetesDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
         {
-            private const string RFC3339MicroFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.ffffffK";
-            private const string RFC3339NanoFormat = "yyyy-MM-dd'T'HH':'mm':'ss.fffffffK";
-            private const string RFC3339Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK";
+            private const string RFC3339MicroFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.ffffffZ";
+            private const string RFC3339NanoFormat = "yyyy-MM-dd'T'HH':'mm':'ss.fffffffZ";
+            private const string RFC3339Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ";
 
             public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             {
@@ -50,13 +54,22 @@
                 throw new FormatException($"Unable to parse {originalstr} as RFC3339 RFC3339Micro or RFC3339Nano");
             }
 
+
             public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
             {
-                writer.WriteStringValue(value.ToString(RFC3339MicroFormat));
+                // Output as RFC3339Micro
+                var date = value.ToUniversalTime();
+
+                var basePart = date.ToString("yyyy-MM-dd'T'HH:mm:ss", CultureInfo.InvariantCulture);
+                var frac = date.ToString(".ffffff", CultureInfo.InvariantCulture)
+                    .TrimEnd('0')
+                    .TrimEnd('.');
+
+                writer.WriteStringValue(basePart + frac + "Z");
             }
         }
 
-        private sealed class KubernetesDateTimeConverter : JsonConverter<DateTime>
+        public sealed class KubernetesDateTimeConverter : JsonConverter<DateTime>
         {
             private static readonly JsonConverter<DateTimeOffset> UtcConverter = new KubernetesDateTimeOffsetConverter();
             public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -72,13 +85,22 @@
 
         static KubernetesJson()
         {
+#if K8S_AOT
+            // Uses Source Generated IJsonTypeInfoResolver
+            JsonSerializerOptions.TypeInfoResolver = SourceGenerationContext.Default;
+#else
+#if NET8_0_OR_GREATER
+            // Uses Source Generated IJsonTypeInfoResolver when available and falls back to reflection
+            JsonSerializerOptions.TypeInfoResolver = JsonTypeInfoResolver.Combine(SourceGenerationContext.Default, new DefaultJsonTypeInfoResolver());
+#endif
+            JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
+#endif
             JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
             JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
             JsonSerializerOptions.Converters.Add(new Iso8601TimeSpanConverter());
             JsonSerializerOptions.Converters.Add(new KubernetesDateTimeConverter());
             JsonSerializerOptions.Converters.Add(new KubernetesDateTimeOffsetConverter());
             JsonSerializerOptions.Converters.Add(new V1Status.V1StatusObjectViewConverter());
-            JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
         }
 
         /// <summary>
@@ -99,47 +121,92 @@
 
         public static TValue Deserialize<TValue>(string json, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (JsonTypeInfo<TValue>)(jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(typeof(TValue));
+            return JsonSerializer.Deserialize(json, info);
+#else
             return JsonSerializer.Deserialize<TValue>(json, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static TValue Deserialize<TValue>(Stream json, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (JsonTypeInfo<TValue>)(jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(typeof(TValue));
+            return JsonSerializer.Deserialize(json, info);
+#else
             return JsonSerializer.Deserialize<TValue>(json, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static TValue Deserialize<TValue>(JsonDocument json, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (JsonTypeInfo<TValue>)(jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(typeof(TValue));
+            return JsonSerializer.Deserialize(json, info);
+#else
             return JsonSerializer.Deserialize<TValue>(json, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static TValue Deserialize<TValue>(JsonElement json, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (JsonTypeInfo<TValue>)(jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(typeof(TValue));
+            return JsonSerializer.Deserialize(json, info);
+#else
             return JsonSerializer.Deserialize<TValue>(json, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static TValue Deserialize<TValue>(JsonNode json, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (JsonTypeInfo<TValue>)(jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(typeof(TValue));
+            return JsonSerializer.Deserialize(json, info);
+#else
             return JsonSerializer.Deserialize<TValue>(json, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static string Serialize(object value, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(value.GetType());
+            return JsonSerializer.Serialize(value, info);
+#else
             return JsonSerializer.Serialize(value, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static string Serialize(JsonDocument value, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(value.GetType());
+            return JsonSerializer.Serialize(value, info);
+#else
             return JsonSerializer.Serialize(value, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static string Serialize(JsonElement value, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(value.GetType());
+            return JsonSerializer.Serialize(value, info);
+#else
             return JsonSerializer.Serialize(value, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
 
         public static string Serialize(JsonNode value, JsonSerializerOptions jsonSerializerOptions = null)
         {
+#if NET8_0_OR_GREATER
+            var info = (jsonSerializerOptions ?? JsonSerializerOptions).GetTypeInfo(value.GetType());
+            return JsonSerializer.Serialize(value, info);
+#else
             return JsonSerializer.Serialize(value, jsonSerializerOptions ?? JsonSerializerOptions);
+#endif
         }
     }
 }

src/KubernetesClient/KubernetesYaml.cs

@@ -21,6 +21,8 @@ public static class KubernetesYaml
                 .WithTypeConverter(new IntOrStringYamlConverter())
                 .WithTypeConverter(new ByteArrayStringYamlConverter())
                 .WithTypeConverter(new ResourceQuantityYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeOffsetYamlConverter())
                 .WithAttemptingUnquotedStringTypeDeserialization()
                 .WithOverridesFromJsonPropertyAttributes();
 
@@ -41,6 +43,8 @@ public static class KubernetesYaml
                 .WithTypeConverter(new IntOrStringYamlConverter())
                 .WithTypeConverter(new ByteArrayStringYamlConverter())
                 .WithTypeConverter(new ResourceQuantityYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeYamlConverter())
+                .WithTypeConverter(new KubernetesDateTimeOffsetYamlConverter())
                 .WithEventEmitter(e => new StringQuotingEmitter(e))
                 .WithEventEmitter(e => new FloatEmitter(e))
                 .ConfigureDefaultValuesHandling(DefaultValuesHandling.OmitNull)