Gen v1.21.0

.github/workflows/buildtest.yaml

@@ -44,10 +44,6 @@ jobs:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 0
-      - name: Setup dotnet SDK 2.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '2.1.x'
       - name: Setup dotnet SDK 3.1
         uses: actions/setup-dotnet@v1
         with:

.github/workflows/nuget.yaml

@@ -13,10 +13,6 @@ jobs:
     - uses: actions/checkout@v1
       with:
         fetch-depth: 0
-    - name: Setup dotnet SDK 2.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '2.1.x'
     - name: Setup dotnet SDK 3.1
       uses: actions/setup-dotnet@v1
       with:

Directory.Build.targets

@@ -4,7 +4,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

csharp.settings

@@ -1,3 +1,3 @@
-export KUBERNETES_BRANCH=v1.20.0
+export KUBERNETES_BRANCH=v1.21.0
 export CLIENT_VERSION=0.0.1
 export PACKAGE_NAME=k8s

src/KubernetesClient/Kubernetes.WebSocket.cs

@@ -312,14 +312,6 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string invocationId
                 }
             }
 
-#if (NETSTANDARD2_0)
-            if (this.CaCerts != null)
-            {
-                webSocketBuilder.SetServerCertificateValidationCallback(ServerCertificateValidationCallback);
-            }
-#endif
-
-#if NETSTANDARD2_1 || NET5_0
             if (this.CaCerts != null)
             {
                 webSocketBuilder.ExpectServerCertificate(this.CaCerts);
@@ -334,7 +326,6 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string invocationId
             {
                 webSocketBuilder.Options.AddSubProtocol(webSocketSubProtocol);
             }
-#endif // NETSTANDARD2_1 || NET5_0
 
             // Send Request
             cancellationToken.ThrowIfCancellationRequested();
@@ -408,25 +399,9 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string invocationId
                 {
                     ServiceClientTracing.Exit(invocationId, null);
                 }
-
-#if (NETSTANDARD2_0)
-                if (this.CaCerts != null)
-                {
-                    webSocketBuilder.CleanupServerCertificateValidationCallback(
-                        ServerCertificateValidationCallback);
-                }
-#endif
             }
 
             return webSocket;
         }
-
-#if (NETSTANDARD2_0)
-        internal bool ServerCertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain,
-            SslPolicyErrors sslPolicyErrors)
-        {
-            return CertificateValidationCallBack(sender, CaCerts, certificate, chain, sslPolicyErrors);
-        }
-#endif
     }
 }

src/KubernetesClient/KubernetesClient.csproj

@@ -9,7 +9,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png</PackageIconUrl>
     <PackageTags>kubernetes;docker;containers;</PackageTags>
 
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5</TargetFrameworks>
     <RootNamespace>k8s</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/KubernetesClient/Versioning/VersionConverter.cs

@@ -134,10 +134,10 @@ private static void ManualConfigurations(IMapperConfigurationExpression cfg)
                     obj.Kind = metadata.Kind;
                 });
             });
-            cfg.CreateMap<V1Subject, Rbacv1alpha1Subject>()
+            cfg.CreateMap<V1Subject, V1alpha1Subject>()
                 .ForMember(dest => dest.ApiVersion, opt => opt.Ignore())
                 .ReverseMap();
-            cfg.CreateMap<Rbacv1beta1Subject, Rbacv1alpha1Subject>()
+            cfg.CreateMap<Rbacv1beta1Subject, V1alpha1Subject>()
                 .ForMember(dest => dest.ApiVersion, opt => opt.Ignore())
                 .ReverseMap();
             cfg.CreateMap<V1Subject, Rbacv1beta1Subject>()
@@ -447,6 +447,14 @@ private static void ManualConfigurations(IMapperConfigurationExpression cfg)
             cfg.CreateMap<V1alpha1ClusterRoleBindingList, V1beta1ClusterRoleBindingList>().ReverseMap();
             cfg.CreateMap<V1alpha1ClusterRoleBindingList, V1ClusterRoleBindingList>().ReverseMap();
             cfg.CreateMap<V1beta1ClusterRoleBindingList, V1ClusterRoleBindingList>().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/WatcherDelegatingHandler.cs

@@ -18,9 +18,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
             HttpRequestMessage request,
             CancellationToken cancellationToken)
         {
-#if NET5_0 || NETSTANDARD2_1
             request.Version = HttpVersion.Version20;
-#endif
             var originResponse = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
 
             // all watches are GETs, so we can ignore others

src/KubernetesClient/WebSocketBuilder.cs

@@ -36,21 +36,6 @@ public virtual WebSocketBuilder AddClientCertificate(X509Certificate2 certificat
             return this;
         }
 
-#if (NETSTANDARD2_0)
-        public WebSocketBuilder SetServerCertificateValidationCallback(
-            RemoteCertificateValidationCallback validationCallback)
-        {
-            System.Net.ServicePointManager.ServerCertificateValidationCallback += validationCallback;
-            return this;
-        }
-
-        public void CleanupServerCertificateValidationCallback(RemoteCertificateValidationCallback validationCallback)
-        {
-            System.Net.ServicePointManager.ServerCertificateValidationCallback -= validationCallback;
-        }
-#endif
-
-#if NETSTANDARD2_1 || NET5_0
         public WebSocketBuilder ExpectServerCertificate(X509Certificate2Collection serverCertificate)
         {
             Options.RemoteCertificateValidationCallback
@@ -70,8 +55,6 @@ public WebSocketBuilder SkipServerCertificateValidation()
             return this;
         }
 
-#endif // NETSTANDARD2_1 || NET5_0
-
         public virtual async Task<WebSocket> BuildAndConnectAsync(Uri uri, CancellationToken cancellationToken)
         {
             await WebSocket.ConnectAsync(uri, cancellationToken).ConfigureAwait(false);