Skip to content

Commit 225bb1f

Browse files
tg123tg123
authored
Gen v1.21.0 (#603)
* gen v1.21.0 * update version converter * bump version to 5 * remove support of netstandard2.0 * update test dependency
1 parent 7d66489 commit 225bb1f

File tree

108 files changed

+64771
-55381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+64771
-55381
lines changed

Diff for: ‎.github/workflows/buildtest.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ jobs:
4444
- uses: actions/checkout@v1
4545
with:
4646
fetch-depth: 0
47-
- name: Setup dotnet SDK 2.1
48-
uses: actions/setup-dotnet@v1
49-
with:
50-
dotnet-version: '2.1.x'
5147
- name: Setup dotnet SDK 3.1
5248
uses: actions/setup-dotnet@v1
5349
with:

Diff for: ‎.github/workflows/nuget.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ jobs:
1313
- uses: actions/checkout@v1
1414
with:
1515
fetch-depth: 0
16-
- name: Setup dotnet SDK 2.1
17-
uses: actions/setup-dotnet@v1
18-
with:
19-
dotnet-version: '2.1.x'
2016
- name: Setup dotnet SDK 3.1
2117
uses: actions/setup-dotnet@v1
2218
with:

Diff for: ‎Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PrivateAssets>All</PrivateAssets>
55
</PackageReference>
66

7-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
7+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
88
<PrivateAssets>All</PrivateAssets>
99
</PackageReference>
1010
</ItemGroup>

Diff for: ‎csharp.settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export KUBERNETES_BRANCH=v1.20.0
1+
export KUBERNETES_BRANCH=v1.21.0
22
export CLIENT_VERSION=0.0.1
33
export PACKAGE_NAME=k8s

Diff for: ‎src/KubernetesClient/Kubernetes.WebSocket.cs

-25
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,6 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string invocationId
312312
}
313313
}
314314

315-
#if (NETSTANDARD2_0)
316-
if (this.CaCerts != null)
317-
{
318-
webSocketBuilder.SetServerCertificateValidationCallback(ServerCertificateValidationCallback);
319-
}
320-
#endif
321-
322-
#if NETSTANDARD2_1 || NET5_0
323315
if (this.CaCerts != null)
324316
{
325317
webSocketBuilder.ExpectServerCertificate(this.CaCerts);
@@ -334,7 +326,6 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string invocationId
334326
{
335327
webSocketBuilder.Options.AddSubProtocol(webSocketSubProtocol);
336328
}
337-
#endif // NETSTANDARD2_1 || NET5_0
338329

339330
// Send Request
340331
cancellationToken.ThrowIfCancellationRequested();
@@ -408,25 +399,9 @@ protected async Task<WebSocket> StreamConnectAsync(Uri uri, string invocationId
408399
{
409400
ServiceClientTracing.Exit(invocationId, null);
410401
}
411-
412-
#if (NETSTANDARD2_0)
413-
if (this.CaCerts != null)
414-
{
415-
webSocketBuilder.CleanupServerCertificateValidationCallback(
416-
ServerCertificateValidationCallback);
417-
}
418-
#endif
419402
}
420403

421404
return webSocket;
422405
}
423-
424-
#if (NETSTANDARD2_0)
425-
internal bool ServerCertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain,
426-
SslPolicyErrors sslPolicyErrors)
427-
{
428-
return CertificateValidationCallBack(sender, CaCerts, certificate, chain, sslPolicyErrors);
429-
}
430-
#endif
431406
}
432407
}

Diff for: ‎src/KubernetesClient/KubernetesClient.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageIconUrl>https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png</PackageIconUrl>
1010
<PackageTags>kubernetes;docker;containers;</PackageTags>
1111

12-
<TargetFrameworks>netstandard2.0;netstandard2.1;net5</TargetFrameworks>
12+
<TargetFrameworks>netstandard2.1;net5</TargetFrameworks>
1313
<RootNamespace>k8s</RootNamespace>
1414
<SignAssembly>true</SignAssembly>
1515
<GenerateDocumentationFile>true</GenerateDocumentationFile>

Diff for: ‎src/KubernetesClient/Versioning/VersionConverter.cs

+10-2
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ private static void ManualConfigurations(IMapperConfigurationExpression cfg)
134134
obj.Kind = metadata.Kind;
135135
});
136136
});
137-
cfg.CreateMap<V1Subject, Rbacv1alpha1Subject>()
137+
cfg.CreateMap<V1Subject, V1alpha1Subject>()
138138
.ForMember(dest => dest.ApiVersion, opt => opt.Ignore())
139139
.ReverseMap();
140-
cfg.CreateMap<Rbacv1beta1Subject, Rbacv1alpha1Subject>()
140+
cfg.CreateMap<Rbacv1beta1Subject, V1alpha1Subject>()
141141
.ForMember(dest => dest.ApiVersion, opt => opt.Ignore())
142142
.ReverseMap();
143143
cfg.CreateMap<V1Subject, Rbacv1beta1Subject>()
@@ -447,6 +447,14 @@ private static void ManualConfigurations(IMapperConfigurationExpression cfg)
447447
cfg.CreateMap<V1alpha1ClusterRoleBindingList, V1beta1ClusterRoleBindingList>().ReverseMap();
448448
cfg.CreateMap<V1alpha1ClusterRoleBindingList, V1ClusterRoleBindingList>().ReverseMap();
449449
cfg.CreateMap<V1beta1ClusterRoleBindingList, V1ClusterRoleBindingList>().ReverseMap();
450+
451+
cfg.CreateMap<V1beta1Endpoint, V1Endpoint>()
452+
.ForMember(dest => dest.DeprecatedTopology, opt => opt.Ignore())
453+
.ForMember(dest => dest.Zone, opt => opt.Ignore())
454+
.ReverseMap();
455+
456+
cfg.CreateMap<V1beta1EndpointPort, Discoveryv1EndpointPort>()
457+
.ReverseMap();
450458
}
451459
}
452460
}

Diff for: ‎src/KubernetesClient/WatcherDelegatingHandler.cs

-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
1818
HttpRequestMessage request,
1919
CancellationToken cancellationToken)
2020
{
21-
#if NET5_0 || NETSTANDARD2_1
2221
request.Version = HttpVersion.Version20;
23-
#endif
2422
var originResponse = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
2523

2624
// all watches are GETs, so we can ignore others

Diff for: ‎src/KubernetesClient/WebSocketBuilder.cs

-17
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,6 @@ public virtual WebSocketBuilder AddClientCertificate(X509Certificate2 certificat
3636
return this;
3737
}
3838

39-
#if (NETSTANDARD2_0)
40-
public WebSocketBuilder SetServerCertificateValidationCallback(
41-
RemoteCertificateValidationCallback validationCallback)
42-
{
43-
System.Net.ServicePointManager.ServerCertificateValidationCallback += validationCallback;
44-
return this;
45-
}
46-
47-
public void CleanupServerCertificateValidationCallback(RemoteCertificateValidationCallback validationCallback)
48-
{
49-
System.Net.ServicePointManager.ServerCertificateValidationCallback -= validationCallback;
50-
}
51-
#endif
52-
53-
#if NETSTANDARD2_1 || NET5_0
5439
public WebSocketBuilder ExpectServerCertificate(X509Certificate2Collection serverCertificate)
5540
{
5641
Options.RemoteCertificateValidationCallback
@@ -70,8 +55,6 @@ public WebSocketBuilder SkipServerCertificateValidation()
7055
return this;
7156
}
7257

73-
#endif // NETSTANDARD2_1 || NET5_0
74-
7558
public virtual async Task<WebSocket> BuildAndConnectAsync(Uri uri, CancellationToken cancellationToken)
7659
{
7760
await WebSocket.ConnectAsync(uri, cancellationToken).ConfigureAwait(false);

0 commit comments

Comments
 (0)