Skip to content

Commit 5e47c09

Browse files
lqlivelqlive
authored
Merge branch 'kubernetes-client:master' into master
2 parents 4d752ed + 5de1c25 commit 5e47c09

Some content is hidden

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

48 files changed

+8209
-5622
lines changed

‎.github/workflows/buildtest.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ jobs:
1717
dotnet-version: |
1818
8.0.x
1919
9.0.x
20-
# - name: Check Format
21-
# # don't check formatting on Windows b/c of CRLF issues.
22-
# if: matrix.os == 'ubuntu-latest'
23-
# run: dotnet format --severity error --verify-no-changes --exclude ./src/KubernetesClient/generated/
2420
- name: Build
25-
run: dotnet build --configuration Release -v detailed
21+
run: dotnet build --configuration Release
2622
- name: Test
2723
run: dotnet test --configuration Release --collect:"Code Coverage;Format=Cobertura" --logger trx --results-directory TestResults --settings CodeCoverage.runsettings --no-build
2824
- name: Upload coverage to Codecov

‎Directory.Packages.props‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,52 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.1" />
7-
<PackageVersion Include="FluentAssertions" Version="8.2.0" />
6+
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2" />
7+
<PackageVersion Include="FluentAssertions" Version="8.6.0" />
88
<PackageVersion Include="Fractions" Version="7.3.0" />
99
<PackageVersion Include="JsonPatch.Net" Version="3.3.0" />
10-
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.5.1" />
11-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
12-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
13-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
14-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15-
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.13.0" />
10+
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
11+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
12+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
13+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
14+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
15+
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.14.1" />
1616
<PackageVersion Include="Moq" Version="4.20.72" />
1717
<PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
1818
<PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
19-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.11.2" />
20-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
19+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
20+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
2121
<PackageVersion Include="Portable.BouncyCastle" Version="1.9.0" />
2222
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
23-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
24-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.4" />
25-
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
26-
<PackageVersion Include="System.Reactive" Version="6.0.1" />
27-
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
23+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.4" />
24+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.8" />
25+
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.15" />
26+
<PackageVersion Include="System.Reactive" Version="6.0.2" />
27+
<PackageVersion Include="System.Text.Json" Version="9.0.8" />
2828
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.3.0" />
29-
<PackageVersion Include="Wiremock.Net" Version="1.7.4" />
29+
<PackageVersion Include="Wiremock.Net" Version="1.12.0" />
3030
<PackageVersion Include="xunit" Version="2.9.3" />
3131
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
3232
<PackageVersion Include="Xunit.StaFact" Version="1.2.69" />
3333
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
3434
</ItemGroup>
3535
<ItemGroup>
36-
<PackageVersion Include="Autofac" Version="8.2.1" />
36+
<PackageVersion Include="Autofac" Version="8.4.0" />
3737
<PackageVersion Include="CaseExtensions" Version="1.1.0" />
38-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
39-
<PackageVersion Include="Namotion.Reflection" Version="3.3.0" />
38+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
39+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
40+
<PackageVersion Include="Namotion.Reflection" Version="3.4.2" />
4041
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
41-
<PackageVersion Include="NJsonSchema" Version="11.2.0" />
42-
<PackageVersion Include="NJsonSchema.Annotations" Version="11.2.0" />
43-
<PackageVersion Include="NSwag.Core" Version="14.3.0" />
42+
<PackageVersion Include="NJsonSchema" Version="11.4.0" />
43+
<PackageVersion Include="NJsonSchema.Annotations" Version="11.4.0" />
44+
<PackageVersion Include="NSwag.Core" Version="14.5.0" />
4445
<PackageVersion Include="Scriban" Version="6.2.1" />
4546
</ItemGroup>
4647
<ItemGroup>
4748
<GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
4849
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
49-
<GlobalPackageReference Include="Microsoft.VisualStudio.SlnGen" Version="12.0.3" />
50-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" />
50+
<GlobalPackageReference Include="Microsoft.VisualStudio.SlnGen" Version="12.0.23" />
51+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
5152
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
5253
</ItemGroup>
53-
</Project>
54+
</Project>

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ ${GEN_DIR}/openapi/csharp.sh ${REPO_DIR}/src/KubernetesClient ${REPO_DIR}/csharp
154154

155155
| SDK Version | Kubernetes Version | .NET Targeting |
156156
|-------------|--------------------|-----------------------------------------------------|
157+
| 18.0 | 1.34 | net8.0;net9.0;net48*;netstandard2.0* |
157158
| 17.0 | 1.33 | net8.0;net9.0;net48*;netstandard2.0* |
158159
| 16.0 | 1.32 | net8.0;net9.0;net48*;netstandard2.0* |
159160
| 15.0 | 1.31 | net6.0;net8.0;net48*;netstandard2.0* |

‎csharp.settings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export KUBERNETES_BRANCH=v1.33.0
1+
export KUBERNETES_BRANCH=v1.34.0
22
export CLIENT_VERSION=0.0.1
33
export PACKAGE_NAME=k8s

‎examples/csrApproval/Program.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,15 @@ string GenerateCertificate(string name)
6767

6868
var replace = new List<V1CertificateSigningRequestCondition>
6969
{
70-
new ("True", "Approved", DateTime.UtcNow, DateTime.UtcNow, "This certificate was approved by k8s client", "Approve"),
70+
new V1CertificateSigningRequestCondition
71+
{
72+
Type = "Approved",
73+
Status = "True",
74+
Reason = "Approve",
75+
Message = "This certificate was approved by k8s client",
76+
LastUpdateTime = DateTime.UtcNow,
77+
LastTransitionTime = DateTime.UtcNow,
78+
},
7179
};
7280
readCert.Status.Conditions = replace;
7381

‎examples/customResource/cResource.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ public override string ToString()
1919
}
2020
}
2121

22-
public class CResourceSpec
22+
public record CResourceSpec
2323
{
2424
[JsonPropertyName("cityName")]
2525
public string CityName { get; set; }
2626
}
2727

28-
public class CResourceStatus : V1Status
28+
public record CResourceStatus : V1Status
2929
{
3030
[JsonPropertyName("temperature")]
3131
public string Temperature { get; set; }

‎examples/resize/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{
2424
Requests = new Dictionary<string, ResourceQuantity>()
2525
{
26-
["cpu"] = new ResourceQuantity("100m"),
26+
["cpu"] = "100m",
2727
},
2828
},
2929
},

‎src/KubernetesClient.Aot/KubernetesClient.Aot.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@
2525
<Compile Include="..\KubernetesClient\Models\IMetadata.cs" />
2626
<Compile Include="..\KubernetesClient\Models\IntOrStringJsonConverter.cs" />
2727
<Compile Include="..\KubernetesClient\Models\IntOrStringYamlConverter.cs" />
28-
<Compile Include="..\KubernetesClient\Models\IntstrIntOrString.cs" />
28+
<Compile Include="..\KubernetesClient\Models\IntOrString.cs" />
2929
<Compile Include="..\KubernetesClient\Models\ISpec.cs" />
3030
<Compile Include="..\KubernetesClient\Models\IStatus.cs" />
31-
<Compile Include="..\KubernetesClient\IValidate.cs" />
3231
<Compile Include="..\KubernetesClient\Models\KubernetesEntityAttribute.cs" />
3332
<Compile Include="..\KubernetesClient\Models\KubernetesList.cs" />
3433
<Compile Include="..\KubernetesClient\KubernetesObject.cs" />
3534
<Compile Include="..\KubernetesClient\Models\ModelExtensions.cs" />
36-
<Compile Include="..\KubernetesClient\Models\ModelVersionConverter.cs" />
3735
<Compile Include="..\KubernetesClient\Models\NodeMetrics.cs" />
3836
<Compile Include="..\KubernetesClient\Models\NodeMetricsList.cs" />
3937
<Compile Include="..\KubernetesClient\Models\PodMetrics.cs" />

‎src/KubernetesClient.Classic/IsExternalInit.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// IntOrString.cs(7,36): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported
2+
namespace System.Runtime.CompilerServices
3+
{
4+
internal static class IsExternalInit { }
5+
}

‎src/KubernetesClient.Classic/KubernetesClient.Classic.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@
2727
<Compile Include="..\KubernetesClient\Models\IMetadata.cs" />
2828
<Compile Include="..\KubernetesClient\Models\IntOrStringJsonConverter.cs" />
2929
<Compile Include="..\KubernetesClient\Models\IntOrStringYamlConverter.cs" />
30-
<Compile Include="..\KubernetesClient\Models\IntstrIntOrString.cs" />
30+
<Compile Include="..\KubernetesClient\Models\IntOrString.cs" />
3131
<Compile Include="..\KubernetesClient\Models\ISpec.cs" />
3232
<Compile Include="..\KubernetesClient\Models\IStatus.cs" />
33-
<Compile Include="..\KubernetesClient\IValidate.cs" />
3433
<Compile Include="..\KubernetesClient\Models\KubernetesEntityAttribute.cs" />
3534
<Compile Include="..\KubernetesClient\KubernetesJson.cs" />
3635
<Compile Include="..\KubernetesClient\Models\KubernetesList.cs" />
3736
<Compile Include="..\KubernetesClient\KubernetesObject.cs" />
3837
<Compile Include="..\KubernetesClient\KubernetesYaml.cs" />
3938
<Compile Include="..\KubernetesClient\Models\ModelExtensions.cs" />
40-
<Compile Include="..\KubernetesClient\Models\ModelVersionConverter.cs" />
4139
<Compile Include="..\KubernetesClient\Models\NodeMetrics.cs" />
4240
<Compile Include="..\KubernetesClient\Models\NodeMetricsList.cs" />
4341
<Compile Include="..\KubernetesClient\Models\PodMetrics.cs" />

0 commit comments

Comments
 (0)