Version 9.0: Based on Swagger 1.25 (#995)

* swagger 1.25

* update version converter

* bump version

* move missing models to models proj

* hide util for further cleanup

* hide more public api

* update version matrix

README.md

@@ -149,6 +149,7 @@ ${GEN_DIR}/openapi/csharp.sh ${REPO_DIR}/src/KubernetesClient ${REPO_DIR}/csharp
 
 | SDK Version | Kubernetes Version | .NET Targeting                                       |
 |-------------|--------------------|------------------------------------------------------|
+| 9.0         | 1.25               | netstandard2.1;net5.0;net6.0;net48*;netstandard2.0*  |
 | 8.0         | 1.24               | netstandard2.1;net5.0;net6.0;net48*;netstandard2.0*  |
 | 7.2         | 1.23               | netstandard2.1;net5.0;net6.0;net48*;netstandard2.0*  |
 | 7.0         | 1.23               | netstandard2.1;net5.0;net6.0                         |

csharp.settings

@@ -1,3 +1,3 @@
-export KUBERNETES_BRANCH=v1.24.0
+export KUBERNETES_BRANCH=v1.25.0
 export CLIENT_VERSION=0.0.1
 export PACKAGE_NAME=k8s

kubernetes-client.sln

@@ -37,8 +37,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkipTestLogger", "tests\Ski
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "customResource", "examples\customResource\customResource.csproj", "{95672061-5799-4454-ACDB-D6D330DB1EC4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericKubernetesApi", "examples\GenericKubernetesApi\GenericKubernetesApi.csproj", "{F81AE4C4-E044-4225-BD76-385A0DE621FD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generic", "examples\generic\generic.csproj", "{F06D4C3A-7825-43A8-832B-6BDE3D355486}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibKubernetesGenerator", "src\LibKubernetesGenerator\LibKubernetesGenerator.csproj", "{64C71596-B916-46EF-8115-B53E238F79D4}"
@@ -251,18 +249,6 @@ Global
 		{95672061-5799-4454-ACDB-D6D330DB1EC4}.Release|x64.Build.0 = Release|Any CPU
 		{95672061-5799-4454-ACDB-D6D330DB1EC4}.Release|x86.ActiveCfg = Release|Any CPU
 		{95672061-5799-4454-ACDB-D6D330DB1EC4}.Release|x86.Build.0 = Release|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Debug|x64.Build.0 = Debug|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Debug|x86.Build.0 = Debug|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Release|x64.ActiveCfg = Release|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Release|x64.Build.0 = Release|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Release|x86.ActiveCfg = Release|Any CPU
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD}.Release|x86.Build.0 = Release|Any CPU
 		{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -486,7 +472,6 @@ Global
 		{5056C4A2-5E12-4C16-8DA7-8835DA58BFF2} = {8AF4A5C2-F0CE-47D5-A4C5-FE4AB83CA509}
 		{4D2AE427-F856-49E5-B61D-EA6B17D89051} = {8AF4A5C2-F0CE-47D5-A4C5-FE4AB83CA509}
 		{95672061-5799-4454-ACDB-D6D330DB1EC4} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
-		{F81AE4C4-E044-4225-BD76-385A0DE621FD} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
 		{F06D4C3A-7825-43A8-832B-6BDE3D355486} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
 		{64C71596-B916-46EF-8115-B53E238F79D4} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
 		{DFBB1025-BD22-459D-A04D-E2AB31E129E2} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}

src/KubernetesClient.Models/Versioning/VersionConverter.cs

@@ -140,257 +140,6 @@ namespace k8s.Versioning
                 .ForMember(dest => dest.User, opt => opt.Ignore())
                 .ReverseMap();
 
-            cfg.CreateMap<V1beta1RuntimeClass, V1RuntimeClass>()
-                .ForMember(dest => dest.Handler, opt => opt.MapFrom(src => src.Handler))
-                .ForMember(dest => dest.Overhead, opt => opt.MapFrom(src => src.Overhead))
-                .ForMember(dest => dest.Scheduling, opt => opt.MapFrom(src => src.Scheduling))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ResourceMetricStatus, V2beta2MetricValueStatus>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.CurrentAverageValue))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.MapFrom(src => src.CurrentAverageUtilization))
-                .ForMember(dest => dest.Value, opt => opt.Ignore());
-            cfg.CreateMap<V2beta1ResourceMetricStatus, V2MetricValueStatus>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.CurrentAverageValue))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.MapFrom(src => src.CurrentAverageUtilization))
-                .ForMember(dest => dest.Value, opt => opt.Ignore());
-            cfg.CreateMap<V2beta1ResourceMetricStatus, V2beta2ResourceMetricStatus>()
-                .ForMember(dest => dest.Current, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2beta2ResourceMetricStatus, V2beta1ResourceMetricStatus>()
-                .ForMember(dest => dest.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(dest => dest.CurrentAverageUtilization, opt => opt.MapFrom(src => src.Current.AverageUtilization));
-            cfg.CreateMap<V2beta1ResourceMetricStatus, V2ResourceMetricStatus>()
-                .ForMember(dest => dest.Current, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2ResourceMetricStatus, V2beta1ResourceMetricStatus>()
-                .ForMember(dest => dest.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(dest => dest.CurrentAverageUtilization, opt => opt.MapFrom(src => src.Current.AverageUtilization));
-            cfg.CreateMap<V2beta1ResourceMetricSource, V2beta2MetricTarget>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.TargetAverageValue))
-                .ForMember(dest => dest.Value, opt => opt.Ignore())
-                .ForMember(dest => dest.Type, opt => opt.MapFrom((src, dest) => src.TargetAverageValue != null ? "AverageValue" : "Utilization"))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.MapFrom(src => src.TargetAverageUtilization));
-            cfg.CreateMap<V2beta1ResourceMetricSource, V2MetricTarget>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.TargetAverageValue))
-                .ForMember(dest => dest.Value, opt => opt.Ignore())
-                .ForMember(dest => dest.Type, opt => opt.MapFrom((src, dest) => src.TargetAverageValue != null ? "AverageValue" : "Utilization"))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.MapFrom(src => src.TargetAverageUtilization));
-            cfg.CreateMap<V2beta1ResourceMetricSource, V2beta2ResourceMetricSource>()
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2beta2ResourceMetricSource, V2beta1ResourceMetricSource>()
-                .ForMember(dest => dest.TargetAverageUtilization, opt => opt.MapFrom(src => src.Target.AverageUtilization))
-                .ForMember(dest => dest.TargetAverageValue, opt => opt.MapFrom(src => src.Target.Value));
-            cfg.CreateMap<V2beta1ResourceMetricSource, V2ResourceMetricSource>()
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2ResourceMetricSource, V2beta1ResourceMetricSource>()
-                .ForMember(dest => dest.TargetAverageUtilization, opt => opt.MapFrom(src => src.Target.AverageUtilization))
-                .ForMember(dest => dest.TargetAverageValue, opt => opt.MapFrom(src => src.Target.Value));
-            cfg.CreateMap<V2beta1PodsMetricStatus, V2beta2MetricValueStatus>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.CurrentAverageValue))
-                .ForMember(dest => dest.Value, opt => opt.Ignore())
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore());
-            cfg.CreateMap<V2beta1PodsMetricStatus, V2MetricValueStatus>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.CurrentAverageValue))
-                .ForMember(dest => dest.Value, opt => opt.Ignore())
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore());
-            cfg.CreateMap<V2beta1PodsMetricStatus, V2beta2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector));
-            cfg.CreateMap<V2beta1PodsMetricStatus, V2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector));
-            cfg.CreateMap<V2beta1PodsMetricStatus, V2beta2PodsMetricStatus>()
-                .ForMember(dest => dest.Current, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.Metric, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2beta2PodsMetricStatus, V2beta1PodsMetricStatus>()
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Metric.Selector))
-                .ForMember(dest => dest.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(dest => dest.MetricName, opt => opt.MapFrom(src => src.Metric.Name));
-            cfg.CreateMap<V2beta1PodsMetricStatus, V2PodsMetricStatus>()
-                .ForMember(dest => dest.Current, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.Metric, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2PodsMetricStatus, V2beta1PodsMetricStatus>()
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Metric.Selector))
-                .ForMember(dest => dest.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(dest => dest.MetricName, opt => opt.MapFrom(src => src.Metric.Name));
-            cfg.CreateMap<V2beta1PodsMetricSource, V2beta2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1PodsMetricSource, V2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1PodsMetricSource, V2beta2MetricTarget>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.TargetAverageValue))
-                .ForMember(dest => dest.Type, opt => opt.MapFrom((src, dest) => "AverageValue"))
-                .ForMember(dest => dest.Value, opt => opt.Ignore())
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore());
-            cfg.CreateMap<V2beta1PodsMetricSource, V2MetricTarget>()
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.TargetAverageValue))
-                .ForMember(dest => dest.Type, opt => opt.MapFrom((src, dest) => "AverageValue"))
-                .ForMember(dest => dest.Value, opt => opt.Ignore())
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore());
-            cfg.CreateMap<V2beta1PodsMetricSource, V2beta2PodsMetricSource>()
-                .ForMember(dest => dest.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2beta2PodsMetricSource, V2beta1PodsMetricSource>()
-                .ForMember(x => x.Selector, opt => opt.MapFrom(src => src.Metric.Selector))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.TargetAverageValue, opt => opt.MapFrom(src => src.Target.AverageValue));
-            cfg.CreateMap<V2beta1PodsMetricSource, V2PodsMetricSource>()
-                .ForMember(dest => dest.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2PodsMetricSource, V2beta1PodsMetricSource>()
-                .ForMember(x => x.Selector, opt => opt.MapFrom(src => src.Metric.Selector))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.TargetAverageValue, opt => opt.MapFrom(src => src.Target.AverageValue));
-            cfg.CreateMap<V2beta1ObjectMetricStatus, V2beta2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ObjectMetricStatus, V2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ObjectMetricStatus, V2beta2MetricValueStatus>()
-                .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.CurrentValue))
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.AverageValue))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore())
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ObjectMetricStatus, V2MetricValueStatus>()
-                .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.CurrentValue))
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.AverageValue))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore())
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ObjectMetricStatus, V2beta2ObjectMetricStatus>()
-                .ForMember(x => x.Current, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.DescribedObject, opt => opt.MapFrom(src => src.Target));
-            cfg.CreateMap<V2beta2ObjectMetricStatus, V2beta1ObjectMetricStatus>()
-                .ForMember(x => x.CurrentValue, opt => opt.MapFrom(src => src.Current.Value))
-                .ForMember(x => x.AverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.Target, opt => opt.MapFrom(src => src.DescribedObject))
-                .ForMember(x => x.Selector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ObjectMetricStatus, V2ObjectMetricStatus>()
-                .ForMember(x => x.Current, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.DescribedObject, opt => opt.MapFrom(src => src.Target));
-            cfg.CreateMap<V2ObjectMetricStatus, V2beta1ObjectMetricStatus>()
-                .ForMember(x => x.CurrentValue, opt => opt.MapFrom(src => src.Current.Value))
-                .ForMember(x => x.AverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.Target, opt => opt.MapFrom(src => src.DescribedObject))
-                .ForMember(x => x.Selector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ExternalMetricSource, V2beta2MetricTarget>()
-                .ForMember(x => x.Value, opt => opt.MapFrom(src => src.TargetValue))
-                .ForMember(x => x.AverageValue, opt => opt.MapFrom(src => src.TargetAverageValue))
-                .ForMember(x => x.AverageUtilization, opt => opt.Ignore())
-                .ForMember(x => x.Type, opt => opt.MapFrom((src, dest) => src.TargetValue != null ? "Value" : "AverageValue"));
-            cfg.CreateMap<V2beta1ExternalMetricSource, V2MetricTarget>()
-                .ForMember(x => x.Value, opt => opt.MapFrom(src => src.TargetValue))
-                .ForMember(x => x.AverageValue, opt => opt.MapFrom(src => src.TargetAverageValue))
-                .ForMember(x => x.AverageUtilization, opt => opt.Ignore())
-                .ForMember(x => x.Type, opt => opt.MapFrom((src, dest) => src.TargetValue != null ? "Value" : "AverageValue"));
-            cfg.CreateMap<V2beta1ExternalMetricSource, V2beta2ExternalMetricSource>()
-                .ForMember(x => x.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.Target, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2beta2ExternalMetricSource, V2beta1ExternalMetricSource>()
-                .ForMember(x => x.TargetValue, opt => opt.MapFrom(src => src.Target.Value))
-                .ForMember(x => x.TargetAverageValue, opt => opt.MapFrom(src => src.Target.AverageValue))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.MetricSelector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ExternalMetricSource, V2ExternalMetricSource>()
-                .ForMember(x => x.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.Target, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2ExternalMetricSource, V2beta1ExternalMetricSource>()
-                .ForMember(x => x.TargetValue, opt => opt.MapFrom(src => src.Target.Value))
-                .ForMember(x => x.TargetAverageValue, opt => opt.MapFrom(src => src.Target.AverageValue))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.MetricSelector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ExternalMetricStatus, V2beta2ExternalMetricStatus>()
-                .ForMember(x => x.Current, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.Metric, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2beta2ExternalMetricStatus, V2beta1ExternalMetricStatus>()
-                .ForMember(x => x.CurrentValue, opt => opt.MapFrom(src => src.Current.Value))
-                .ForMember(x => x.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.MetricSelector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ExternalMetricStatus, V2ExternalMetricStatus>()
-                .ForMember(x => x.Current, opt => opt.MapFrom(src => src))
-                .ForMember(x => x.Metric, opt => opt.MapFrom(src => src));
-            cfg.CreateMap<V2ExternalMetricStatus, V2beta1ExternalMetricStatus>()
-                .ForMember(x => x.CurrentValue, opt => opt.MapFrom(src => src.Current.Value))
-                .ForMember(x => x.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(x => x.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(x => x.MetricSelector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ExternalMetricStatus, V2beta2MetricIdentifier>()
-                .ForMember(x => x.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(x => x.Selector, opt => opt.MapFrom(src => src.MetricSelector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ExternalMetricStatus, V2MetricIdentifier>()
-                .ForMember(x => x.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(x => x.Selector, opt => opt.MapFrom(src => src.MetricSelector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ExternalMetricStatus, V2beta2MetricValueStatus>()
-                .ForMember(x => x.Value, opt => opt.MapFrom(src => src.CurrentValue))
-                .ForMember(x => x.AverageValue, opt => opt.MapFrom(src => src.CurrentAverageValue))
-                .ForMember(x => x.AverageUtilization, opt => opt.Ignore())
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ExternalMetricStatus, V2MetricValueStatus>()
-                .ForMember(x => x.Value, opt => opt.MapFrom(src => src.CurrentValue))
-                .ForMember(x => x.AverageValue, opt => opt.MapFrom(src => src.CurrentAverageValue))
-                .ForMember(x => x.AverageUtilization, opt => opt.Ignore())
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ObjectMetricSource, V2beta2MetricTarget>()
-                .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.TargetValue))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore())
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.AverageValue))
-                .ForMember(dest => dest.Type, opt => opt.MapFrom((src, dest) => src.TargetValue != null ? "Value" : "AverageValue"));
-            cfg.CreateMap<V2beta1ObjectMetricSource, V2MetricTarget>()
-                .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.TargetValue))
-                .ForMember(dest => dest.AverageUtilization, opt => opt.Ignore())
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.AverageValue))
-                .ForMember(dest => dest.Type, opt => opt.MapFrom((src, dest) => src.TargetValue != null ? "Value" : "AverageValue"));
-            cfg.CreateMap<V2beta1ObjectMetricSource, V2beta2ObjectMetricSource>()
-                .ForMember(dest => dest.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.DescribedObject, opt => opt.MapFrom(src => src.Target));
-            cfg.CreateMap<V2beta2ObjectMetricSource, V2beta1ObjectMetricSource>()
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src.DescribedObject))
-                .ForMember(dest => dest.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(dest => dest.TargetValue, opt => opt.MapFrom(src => src.Target.Value))
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.Target.AverageValue))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ObjectMetricSource, V2ObjectMetricSource>()
-                .ForMember(dest => dest.Metric, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src))
-                .ForMember(dest => dest.DescribedObject, opt => opt.MapFrom(src => src.Target));
-            cfg.CreateMap<V2ObjectMetricSource, V2beta1ObjectMetricSource>()
-                .ForMember(dest => dest.Target, opt => opt.MapFrom(src => src.DescribedObject))
-                .ForMember(dest => dest.MetricName, opt => opt.MapFrom(src => src.Metric.Name))
-                .ForMember(dest => dest.TargetValue, opt => opt.MapFrom(src => src.Target.Value))
-                .ForMember(dest => dest.AverageValue, opt => opt.MapFrom(src => src.Target.AverageValue))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Metric.Selector));
-            cfg.CreateMap<V2beta1ObjectMetricSource, V2beta2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ObjectMetricSource, V2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.Selector))
-                .ReverseMap();
-            cfg.CreateMap<V2beta1ExternalMetricSource, V2beta2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.MetricSelector));
-            cfg.CreateMap<V2beta1ExternalMetricSource, V2MetricIdentifier>()
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.MetricName))
-                .ForMember(dest => dest.Selector, opt => opt.MapFrom(src => src.MetricSelector));
-            cfg.CreateMap<V2beta2MetricTarget, V2beta1ExternalMetricSource>() // todo: not needed
-                .ForMember(dest => dest.MetricName, opt => opt.Ignore())
-                .ForMember(dest => dest.MetricSelector, opt => opt.Ignore())
-                .ForMember(dest => dest.TargetValue, opt => opt.MapFrom(src => src.Value))
-                .ForMember(dest => dest.TargetValue, opt => opt.MapFrom(src => src.Value))
-                .ForMember(dest => dest.TargetAverageValue, opt => opt.MapFrom(src => src.AverageValue));
 
             cfg.CreateMap<V1HorizontalPodAutoscalerSpec, V2beta2HorizontalPodAutoscalerSpec>()
                 .ForMember(dest => dest.Metrics, opt => opt.Ignore())
@@ -402,22 +151,7 @@ namespace k8s.Versioning
                 .ForMember(dest => dest.Behavior, opt => opt.Ignore())
                 .ReverseMap();
 
-            cfg.CreateMap<V1HorizontalPodAutoscalerSpec, V2beta1HorizontalPodAutoscalerSpec>()
-                .ForMember(dest => dest.Metrics, opt => opt.Ignore())
-                .ReverseMap();
 
-            cfg.CreateMap<V2beta1HorizontalPodAutoscalerSpec, V2beta2HorizontalPodAutoscalerSpec>()
-                .ForMember(dest => dest.Behavior, opt => opt.Ignore())
-                .ReverseMap();
-
-            cfg.CreateMap<V2beta1HorizontalPodAutoscalerSpec, V2HorizontalPodAutoscalerSpec>()
-                .ForMember(dest => dest.Behavior, opt => opt.Ignore())
-                .ReverseMap();
-
-            cfg.CreateMap<V1HorizontalPodAutoscalerStatus, V2beta1HorizontalPodAutoscalerStatus>()
-                .ForMember(dest => dest.Conditions, opt => opt.Ignore())
-                .ForMember(dest => dest.CurrentMetrics, opt => opt.Ignore())
-                .ReverseMap();
             cfg.CreateMap<V1HorizontalPodAutoscalerStatus, V2beta2HorizontalPodAutoscalerStatus>()
                 .ForMember(dest => dest.Conditions, opt => opt.Ignore())
                 .ForMember(dest => dest.CurrentMetrics, opt => opt.Ignore())
@@ -426,48 +160,6 @@ namespace k8s.Versioning
                 .ForMember(dest => dest.Conditions, opt => opt.Ignore())
                 .ForMember(dest => dest.CurrentMetrics, opt => opt.Ignore())
                 .ReverseMap();
-
-            cfg.CreateMap<Corev1EventSeries, V1beta1EventSeries>()
-                .ForMember(dest => dest.LastObservedTime, opt => opt.MapFrom(src => src.LastObservedTime))
-                .ReverseMap();
-
-            cfg.CreateMap<Corev1Event, V1beta1Event>()
-                .ForMember(dest => dest.DeprecatedCount, opt => opt.Ignore())
-                .ForMember(dest => dest.DeprecatedFirstTimestamp, opt => opt.MapFrom(src => src.FirstTimestamp))
-                .ForMember(dest => dest.DeprecatedLastTimestamp, opt => opt.MapFrom(src => src.LastTimestamp))
-                .ForMember(dest => dest.DeprecatedSource, opt => opt.MapFrom(src => src.Source))
-                .ForMember(dest => dest.Note, opt => opt.MapFrom(src => src.Message))
-                .ForMember(dest => dest.Regarding, opt => opt.MapFrom(src => src.InvolvedObject))
-                .ForMember(dest => dest.ReportingController, opt => opt.MapFrom(src => src.ReportingComponent))
-                .ReverseMap();
-
-            cfg.CreateMap<V2beta2ContainerResourceMetricSource, V2beta1ContainerResourceMetricSource>()
-                .ForMember(dest => dest.TargetAverageValue, opt => opt.MapFrom(src => src.Target.AverageValue))
-                .ForMember(dest => dest.TargetAverageUtilization, opt => opt.MapFrom(src => src.Target.AverageUtilization))
-                .ReverseMap();
-
-            cfg.CreateMap<V2ContainerResourceMetricSource, V2beta1ContainerResourceMetricSource>()
-                .ForMember(dest => dest.TargetAverageValue, opt => opt.MapFrom(src => src.Target.AverageValue))
-                .ForMember(dest => dest.TargetAverageUtilization, opt => opt.MapFrom(src => src.Target.AverageUtilization))
-                .ReverseMap();
-
-            cfg.CreateMap<V2beta2ContainerResourceMetricStatus, V2beta1ContainerResourceMetricStatus>()
-                .ForMember(dest => dest.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(dest => dest.CurrentAverageUtilization, opt => opt.MapFrom(src => src.Current.AverageUtilization))
-                .ReverseMap();
-
-            cfg.CreateMap<V2ContainerResourceMetricStatus, V2beta1ContainerResourceMetricStatus>()
-                .ForMember(dest => dest.CurrentAverageValue, opt => opt.MapFrom(src => src.Current.AverageValue))
-                .ForMember(dest => dest.CurrentAverageUtilization, opt => opt.MapFrom(src => src.Current.AverageUtilization))
-                .ReverseMap();
-
-            cfg.CreateMap<V1beta1Endpoint, V1Endpoint>()
-                .ForMember(dest => dest.DeprecatedTopology, opt => opt.Ignore())
-                .ForMember(dest => dest.Zone, opt => opt.Ignore())
-                .ReverseMap();
-
-            cfg.CreateMap<V1beta1EndpointPort, Discoveryv1EndpointPort>()
-                .ReverseMap();
         }
     }
 }

src/KubernetesClient/KubernetesClient.csproj

@@ -5,6 +5,13 @@
     <RootNamespace>k8s</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!--TODO merge util folder -->
+    <Compile Remove="Util\**" />
+    <EmbeddedResource Remove="Util\**" />
+    <None Remove="Util\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="prometheus-net" Version="6.0.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.22.1" />
@@ -14,10 +21,6 @@
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" Condition="'$(TargetFramework)' == 'netstandard2.1'" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Util\Informer" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\KubernetesClient.Models\KubernetesClient.Models.csproj" />
     <ProjectReference Include="..\KubernetesClient.Basic\KubernetesClient.Basic.csproj" />

src/KubernetesClient/KubernetesRequestDigest.cs

@@ -6,7 +6,7 @@ using System.Web;
 
 namespace k8s
 {
-    public class KubernetesRequestDigest
+    internal class KubernetesRequestDigest
     {
         private static Regex resourcePattern =
             new Regex(@"^/(api|apis)(/\S+)?/v\d\w*/\S+", RegexOptions.Compiled);

tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj

@@ -39,10 +39,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
+    <Compile Remove="Util\**" />
+    <Content Remove="Util\**" />
+    <EmbeddedResource Remove="Util\**" />
+    <None Remove="Util\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Util\Common" />
+    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
   </ItemGroup>
 </Project>

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "8.0",
+  "version": "9.0",
   "publicReleaseRefSpec": [
     "^refs/heads/master$",
     "^refs/tags/v\\d+\\.\\d+\\.\\d+"