kubernetes-client/csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

embed KubernetesClient.Models and KubernetesClient.Basic into client sdk (#1407)

Browse Source 
* cleanup using

* cleanup classic

* clean up nuget

* bump ver

* fix pipeline

* remove commit by accident
This commit is contained in:
Boshi Lian
2023-09-26 11:03:12 -07:00
committed by GitHub
parent 80c1315ee0
commit 013fc6e06f
59 changed files with 169 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/buildtest.yaml vendored
View File

@@ -52,9 +52,9 @@ jobs:
with: with:
dotnet-version: '7.0.x' dotnet-version: '7.0.x'
- name: Restore nugets (msbuild) - name: Restore nugets (msbuild)
run: msbuild .\src\KubernetesClient.Models\ -t:restore -p:RestorePackagesConfig=true run: msbuild .\src\KubernetesClient\ -t:restore -p:RestorePackagesConfig=true
- name: Build (msbuild) - name: Build (msbuild)
run: msbuild .\src\KubernetesClient.Models\ run: msbuild .\src\KubernetesClient\
e2e: e2e:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
.github/workflows/nuget.yaml vendored
View File

@@ -44,8 +44,6 @@ jobs:
matrix: matrix:
nuget-package: nuget-package:
- "KubernetesClient" - "KubernetesClient"
- "KubernetesClient.Models"
- "KubernetesClient.Basic"
- "KubernetesClient.Classic" - "KubernetesClient.Classic"
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:

30
kubernetes-client.sln
View File

@@ -47,10 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus", "examples\prom
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "yaml", "examples\yaml\yaml.csproj", "{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "yaml", "examples\yaml\yaml.csproj", "{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Models", "src\KubernetesClient.Models\KubernetesClient.Models.csproj", "{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Basic", "src\KubernetesClient.Basic\KubernetesClient.Basic.csproj", "{927995F5-05CC-4078-8805-8E6CC06914D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Classic", "src\KubernetesClient.Classic\KubernetesClient.Classic.csproj", "{80F19E8A-F097-4AA4-A68C-D417B96BBC68}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Classic", "src\KubernetesClient.Classic\KubernetesClient.Classic.csproj", "{80F19E8A-F097-4AA4-A68C-D417B96BBC68}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Classic.Tests", "tests\KubernetesClient.Classic.Tests\KubernetesClient.Classic.Tests.csproj", "{FD90C861-56C6-4536-B7F5-AC7779296384}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Classic.Tests", "tests\KubernetesClient.Classic.Tests\KubernetesClient.Classic.Tests.csproj", "{FD90C861-56C6-4536-B7F5-AC7779296384}"
@@ -311,30 +307,6 @@ Global
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x64.Build.0 = Release|Any CPU {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x64.Build.0 = Release|Any CPU
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.ActiveCfg = Release|Any CPU {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.ActiveCfg = Release|Any CPU
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.Build.0 = Release|Any CPU {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.Build.0 = Release|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x64.ActiveCfg = Debug|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x64.Build.0 = Debug|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x86.ActiveCfg = Debug|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x86.Build.0 = Debug|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|Any CPU.Build.0 = Release|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x64.ActiveCfg = Release|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x64.Build.0 = Release|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x86.ActiveCfg = Release|Any CPU
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x86.Build.0 = Release|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x64.ActiveCfg = Debug|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x64.Build.0 = Debug|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x86.ActiveCfg = Debug|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x86.Build.0 = Debug|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|Any CPU.Build.0 = Release|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x64.ActiveCfg = Release|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x64.Build.0 = Release|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x86.ActiveCfg = Release|Any CPU
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x86.Build.0 = Release|Any CPU
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.Build.0 = Debug|Any CPU {80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|x64.ActiveCfg = Debug|Any CPU {80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -491,8 +463,6 @@ Global
{DFBB1025-BD22-459D-A04D-E2AB31E129E2} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40} {DFBB1025-BD22-459D-A04D-E2AB31E129E2} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
{682B94E4-1761-48FF-B5D0-87B45DC0C735} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40} {682B94E4-1761-48FF-B5D0-87B45DC0C735} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40} {17AB0AD8-6C90-42DD-880C-16B5AC4A373F} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
{927995F5-05CC-4078-8805-8E6CC06914D8} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
{80F19E8A-F097-4AA4-A68C-D417B96BBC68} = {3D1864AA-1FFC-4512-BB13-46055E410F73} {80F19E8A-F097-4AA4-A68C-D417B96BBC68} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
{FD90C861-56C6-4536-B7F5-AC7779296384} = {8AF4A5C2-F0CE-47D5-A4C5-FE4AB83CA509} {FD90C861-56C6-4536-B7F5-AC7779296384} = {8AF4A5C2-F0CE-47D5-A4C5-FE4AB83CA509}
{F626860C-F141-45B3-9DDD-88AD3932ACAF} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40} {F626860C-F141-45B3-9DDD-88AD3932ACAF} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}

2
src/KubernetesClient.Basic/AbstractKubernetes.cs
View File

@@ -15,7 +15,7 @@ public abstract partial class AbstractKubernetes
public static readonly HttpMethod Put = HttpMethod.Put; public static readonly HttpMethod Put = HttpMethod.Put;
public static readonly HttpMethod Trace = HttpMethod.Trace; public static readonly HttpMethod Trace = HttpMethod.Trace;
#if NETSTANDARD2_0 #if NETSTANDARD2_0 || NET48
public static readonly HttpMethod Patch = new HttpMethod("PATCH"); public static readonly HttpMethod Patch = new HttpMethod("PATCH");
#else #else
public static readonly HttpMethod Patch = HttpMethod.Patch; public static readonly HttpMethod Patch = HttpMethod.Patch;

18
src/KubernetesClient.Basic/KubernetesClient.Basic.csproj
View File

@@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
<RootNamespace>k8s</RootNamespace>
</PropertyGroup>
<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="Generator" />
<AdditionalFiles Include="..\..\swagger.json" Generator="api,version" />
<ProjectReference Include="..\KubernetesClient.Models\KubernetesClient.Models.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>

1
src/KubernetesClient.Classic/CertUtils.cs
View File

@@ -6,7 +6,6 @@ using Org.BouncyCastle.OpenSsl;
using Org.BouncyCastle.Pkcs; using Org.BouncyCastle.Pkcs;
using Org.BouncyCastle.Security; using Org.BouncyCastle.Security;
using Org.BouncyCastle.X509; using Org.BouncyCastle.X509;
using System.IO;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
namespace k8s namespace k8s

5
src/KubernetesClient.Classic/Global.cs
View File

@@ -1,5 +1,10 @@
global using k8s.Autorest;
global using k8s.Models;
global using System; global using System;
global using System.Collections.Generic; global using System.Collections.Generic;
global using System.IO;
global using System.Linq; global using System.Linq;
global using System.Text.Json; global using System.Text.Json;
global using System.Text.Json.Serialization; global using System.Text.Json.Serialization;
global using System.Threading;
global using System.Threading.Tasks;

77
src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
View File

@@ -10,11 +10,70 @@
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" /> <PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageReference Include="Fractions" Version="7.2.1" />
<PackageReference Include="YamlDotNet" Version="13.3.1" />
<PackageReference Include="System.Text.Json" Version="7.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\KubernetesClient.Models\KubernetesClient.Models.csproj" /> <Compile Include="..\KubernetesClient.Models\ContainerMetrics.cs" />
<ProjectReference Include="..\KubernetesClient.Basic\KubernetesClient.Basic.csproj" /> <Compile Include="..\KubernetesClient.Models\Extensions.cs" />
<Compile Include="..\KubernetesClient.Models\FloatEmitter.cs" />
<Compile Include="..\KubernetesClient.Models\GeneratedModelVersion.cs" />
<Compile Include="..\KubernetesClient.Models\IItems.cs" />
<Compile Include="..\KubernetesClient.Models\IKubernetesObject.cs" />
<Compile Include="..\KubernetesClient.Models\IMetadata.cs" />
<Compile Include="..\KubernetesClient.Models\IntOrStringJsonConverter.cs" />
<Compile Include="..\KubernetesClient.Models\IntOrStringYamlConverter.cs" />
<Compile Include="..\KubernetesClient.Models\IntstrIntOrString.cs" />
<Compile Include="..\KubernetesClient.Models\ISpec.cs" />
<Compile Include="..\KubernetesClient.Models\IStatus.cs" />
<Compile Include="..\KubernetesClient.Models\IValidate.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesEntityAttribute.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesJson.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesList.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesObject.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesYaml.cs" />
<Compile Include="..\KubernetesClient.Models\ModelExtensions.cs" />
<Compile Include="..\KubernetesClient.Models\ModelVersionConverter.cs" />
<Compile Include="..\KubernetesClient.Models\NodeMetrics.cs" />
<Compile Include="..\KubernetesClient.Models\NodeMetricsList.cs" />
<Compile Include="..\KubernetesClient.Models\PodMetrics.cs" />
<Compile Include="..\KubernetesClient.Models\PodMetricsList.cs" />
<Compile Include="..\KubernetesClient.Models\ResourceQuantity.cs" />
<Compile Include="..\KubernetesClient.Models\ResourceQuantityJsonConverter.cs" />
<Compile Include="..\KubernetesClient.Models\ResourceQuantityYamlConverter.cs" />
<Compile Include="..\KubernetesClient.Models\StringQuotingEmitter.cs" />
<Compile Include="..\KubernetesClient.Models\V1Patch.cs" />
<Compile Include="..\KubernetesClient.Models\V1PatchJsonConverter.cs" />
<Compile Include="..\KubernetesClient.Models\V1PodTemplateSpec.cs" />
<Compile Include="..\KubernetesClient.Models\V1Status.cs" />
<Compile Include="..\KubernetesClient.Models\V1Status.ObjectView.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ClusterEndpoint.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\Context.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ContextDetails.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ExecCredentialResponse.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ExternalExecution.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\K8SConfiguration.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\NamedExtension.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\User.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\UserCredentials.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\Cluster.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\AuthProvider.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\KubernetesClient.Basic\AbstractKubernetes.cs" />
<Compile Include="..\KubernetesClient.Basic\GeneratedApiVersion.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpExtensions.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpMessageWrapper.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpOperationException.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpOperationResponse.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpRequestMessageWrapper.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpResponseMessageWrapper.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -59,8 +118,16 @@
<Compile Include="..\KubernetesClient\Authentication\StringTokenProvider.cs" /> <Compile Include="..\KubernetesClient\Authentication\StringTokenProvider.cs" />
<Compile Include="..\KubernetesClient\Authentication\TokenCredentials.cs" /> <Compile Include="..\KubernetesClient\Authentication\TokenCredentials.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'net48'" /> <Reference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup> </ItemGroup>
</Project>
<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="Generator" />
<AdditionalFiles Include="..\..\swagger.json"
Generator="model,modelext,api,version,versionconverterstub" />
<ProjectReference Include="..\LibKubernetesGenerator\LibKubernetesGenerator.csproj"
OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>

2
src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
View File

@@ -11,7 +11,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\KubernetesClient.Models\KubernetesClient.Models.csproj" /> <ProjectReference Include="..\KubernetesClient\KubernetesClient.csproj" />
<PackageReference Include="AutoMapper" Version="12.0.1" /> <PackageReference Include="AutoMapper" Version="12.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
src/KubernetesClient.Models/Extensions.cs
View File

@@ -1,4 +1,3 @@
using k8s.Models;
using System.Reflection; using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;

2
src/KubernetesClient.Models/IMetadata.cs
View File

@@ -1,5 +1,3 @@
using k8s.Models;
namespace k8s namespace k8s
{ {
/// <summary> /// <summary>

18
src/KubernetesClient.Models/KubernetesClient.Models.csproj
View File

@@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
<RootNamespace>k8s.Models</RootNamespace>
</PropertyGroup>
<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="Generator" />
<AdditionalFiles Include="..\..\swagger.json" Generator="model,modelext,version,versionconverterstub" />
<ProjectReference Include="..\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Text.Json" Version="7.0.3" />
<PackageReference Include="Fractions" Version="7.2.1" />
<PackageReference Include="YamlDotNet" Version="13.4.0" />
</ItemGroup>
</Project>

2
src/KubernetesClient.Models/KubernetesJson.cs
View File

@@ -1,6 +1,4 @@
using k8s.Models;
using System.Globalization; using System.Globalization;
using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Xml; using System.Xml;

3
src/KubernetesClient.Models/KubernetesYaml.cs
View File

@@ -1,8 +1,5 @@
using k8s.Models;
using System.IO;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks;
using YamlDotNet.Core; using YamlDotNet.Core;
using YamlDotNet.Core.Events; using YamlDotNet.Core.Events;
using YamlDotNet.Serialization; using YamlDotNet.Serialization;

2
src/KubernetesClient/Authentication/BasicAuthenticationCredentials.cs
View File

@@ -5,8 +5,6 @@ using System.Globalization;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

2
src/KubernetesClient/Authentication/ExecTokenProvider.cs
View File

@@ -1,7 +1,5 @@
using k8s.KubeConfigModels; using k8s.KubeConfigModels;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

2
src/KubernetesClient/Authentication/GcpTokenProvider.cs
View File

@@ -1,8 +1,6 @@
using k8s.Exceptions; using k8s.Exceptions;
using System.Diagnostics; using System.Diagnostics;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

2
src/KubernetesClient/Authentication/ITokenProvider.cs
View File

@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information. // Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
#pragma warning disable SA1606 #pragma warning disable SA1606
#pragma warning disable SA1614 #pragma warning disable SA1614

2
src/KubernetesClient/Authentication/OidcTokenProvider.cs
View File

@@ -2,8 +2,6 @@ using IdentityModel.OidcClient;
using k8s.Exceptions; using k8s.Exceptions;
using System.IdentityModel.Tokens.Jwt; using System.IdentityModel.Tokens.Jwt;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

2
src/KubernetesClient/Authentication/ServiceClientCredentials.cs
View File

@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information. // Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http; using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

2
src/KubernetesClient/Authentication/StringTokenProvider.cs
View File

@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information. // Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

2
src/KubernetesClient/Authentication/TokenCredentials.cs
View File

@@ -2,8 +2,6 @@
// Licensed under the MIT License. See License.txt in the project root for license information. // Licensed under the MIT License. See License.txt in the project root for license information.
using System.Net.Http; using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

3
src/KubernetesClient/Authentication/TokenFileAuth.cs
View File

@@ -1,7 +1,4 @@
using System.IO;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.Authentication namespace k8s.Authentication
{ {

1
src/KubernetesClient/ByteBuffer.cs
View File

@@ -1,6 +1,5 @@
using System.Buffers; using System.Buffers;
using System.Diagnostics; using System.Diagnostics;
using System.Threading;
namespace k8s namespace k8s
{ {

3
src/KubernetesClient/CertUtils.cs
View File

@@ -1,8 +1,7 @@
using k8s.Exceptions; using k8s.Exceptions;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text;
using System.IO;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Text;
namespace k8s namespace k8s
{ {

3
src/KubernetesClient/ExecAsyncCallback.cs
View File

@@ -1,6 +1,3 @@
using System.IO;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {
/// <summary> /// <summary>

2
src/KubernetesClient/FileSystem.cs
View File

@@ -1,5 +1,3 @@
using System.IO;
namespace k8s namespace k8s
{ {
internal static class FileSystem internal static class FileSystem

5
src/KubernetesClient/GenericClient.cs
View File

@@ -1,8 +1,3 @@
using k8s.Models;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {
public class GenericClient : IDisposable public class GenericClient : IDisposable

5
src/KubernetesClient/Global.cs
View File

@@ -1,5 +1,10 @@
global using k8s.Autorest;
global using k8s.Models;
global using System; global using System;
global using System.Collections.Generic; global using System.Collections.Generic;
global using System.IO;
global using System.Linq; global using System.Linq;
global using System.Text.Json; global using System.Text.Json;
global using System.Text.Json.Serialization; global using System.Text.Json.Serialization;
global using System.Threading;
global using System.Threading.Tasks;

3
src/KubernetesClient/IKubernetes.Exec.cs
View File

@@ -1,6 +1,3 @@
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {
public partial interface IKubernetes public partial interface IKubernetes

2
src/KubernetesClient/IKubernetes.WebSocket.cs
View File

@@ -1,6 +1,4 @@
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

4
src/KubernetesClient/IStreamDemuxer.cs
View File

@@ -1,7 +1,3 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {
/// <summary> /// <summary>

1
src/KubernetesClient/Kubernetes.ConfigInit.cs
View File

@@ -3,7 +3,6 @@ using k8s.Exceptions;
using System.Net.Http; using System.Net.Http;
using System.Net.Security; using System.Net.Security;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Threading;
namespace k8s namespace k8s
{ {

6
src/KubernetesClient/Kubernetes.Exec.cs
View File

@@ -1,9 +1,3 @@
using k8s.Autorest;
using k8s.Models;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {
public partial class Kubernetes public partial class Kubernetes

4
src/KubernetesClient/Kubernetes.WebSocket.cs
View File

@@ -1,13 +1,9 @@
using k8s.Autorest;
using k8s.Models;
using System.Globalization; using System.Globalization;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

4
src/KubernetesClient/Kubernetes.cs
View File

@@ -1,10 +1,6 @@
using k8s.Authentication; using k8s.Authentication;
using k8s.Autorest;
using System.IO;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

94
src/KubernetesClient/KubernetesClient.csproj
View File

@@ -1,19 +1,85 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks> <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<RootNamespace>k8s</RootNamespace> <RootNamespace>k8s</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="prometheus-net" Version="8.0.1" /> <PackageReference Include="prometheus-net" Version="8.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" /> <PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
</ItemGroup> <PackageReference Include="Fractions" Version="7.2.1" />
<PackageReference Include="YamlDotNet" Version="13.3.1" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\KubernetesClient.Models\KubernetesClient.Models.csproj" /> <Compile Include="..\KubernetesClient.Models\ContainerMetrics.cs" />
<ProjectReference Include="..\KubernetesClient.Basic\KubernetesClient.Basic.csproj" /> <Compile Include="..\KubernetesClient.Models\Extensions.cs" />
</ItemGroup> <Compile Include="..\KubernetesClient.Models\FloatEmitter.cs" />
<Compile Include="..\KubernetesClient.Models\GeneratedModelVersion.cs" />
<Compile Include="..\KubernetesClient.Models\IItems.cs" />
<Compile Include="..\KubernetesClient.Models\IKubernetesObject.cs" />
<Compile Include="..\KubernetesClient.Models\IMetadata.cs" />
<Compile Include="..\KubernetesClient.Models\IntOrStringJsonConverter.cs" />
<Compile Include="..\KubernetesClient.Models\IntOrStringYamlConverter.cs" />
<Compile Include="..\KubernetesClient.Models\IntstrIntOrString.cs" />
<Compile Include="..\KubernetesClient.Models\ISpec.cs" />
<Compile Include="..\KubernetesClient.Models\IStatus.cs" />
<Compile Include="..\KubernetesClient.Models\IValidate.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesEntityAttribute.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesJson.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesList.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesObject.cs" />
<Compile Include="..\KubernetesClient.Models\KubernetesYaml.cs" />
<Compile Include="..\KubernetesClient.Models\ModelExtensions.cs" />
<Compile Include="..\KubernetesClient.Models\ModelVersionConverter.cs" />
<Compile Include="..\KubernetesClient.Models\NodeMetrics.cs" />
<Compile Include="..\KubernetesClient.Models\NodeMetricsList.cs" />
<Compile Include="..\KubernetesClient.Models\PodMetrics.cs" />
<Compile Include="..\KubernetesClient.Models\PodMetricsList.cs" />
<Compile Include="..\KubernetesClient.Models\ResourceQuantity.cs" />
<Compile Include="..\KubernetesClient.Models\ResourceQuantityJsonConverter.cs" />
<Compile Include="..\KubernetesClient.Models\ResourceQuantityYamlConverter.cs" />
<Compile Include="..\KubernetesClient.Models\StringQuotingEmitter.cs" />
<Compile Include="..\KubernetesClient.Models\V1Patch.cs" />
<Compile Include="..\KubernetesClient.Models\V1PatchJsonConverter.cs" />
<Compile Include="..\KubernetesClient.Models\V1PodTemplateSpec.cs" />
<Compile Include="..\KubernetesClient.Models\V1Status.cs" />
<Compile Include="..\KubernetesClient.Models\V1Status.ObjectView.cs" />
</Project> <Compile Include="..\KubernetesClient.Models\KubeConfigModels\ClusterEndpoint.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\Context.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ContextDetails.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ExecCredentialResponse.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ExternalExecution.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\K8SConfiguration.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\NamedExtension.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\User.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\UserCredentials.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\Cluster.cs" />
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\AuthProvider.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\KubernetesClient.Basic\AbstractKubernetes.cs" />
<Compile Include="..\KubernetesClient.Basic\GeneratedApiVersion.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpExtensions.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpMessageWrapper.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpOperationException.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpOperationResponse.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpRequestMessageWrapper.cs" />
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpResponseMessageWrapper.cs" />
</ItemGroup>
<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="Generator" />
<AdditionalFiles Include="..\..\swagger.json"
Generator="model,modelext,api,version,versionconverterstub" />
<ProjectReference Include="..\LibKubernetesGenerator\LibKubernetesGenerator.csproj"
OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
</Project>

2
src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
View File

@@ -2,11 +2,9 @@ using k8s.Authentication;
using k8s.Exceptions; using k8s.Exceptions;
using k8s.KubeConfigModels; using k8s.KubeConfigModels;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Net; using System.Net;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

1
src/KubernetesClient/KubernetesClientConfiguration.InCluster.cs
View File

@@ -1,6 +1,5 @@
using k8s.Authentication; using k8s.Authentication;
using k8s.Exceptions; using k8s.Exceptions;
using System.IO;
namespace k8s namespace k8s
{ {

1
src/KubernetesClient/KubernetesException.cs
View File

@@ -1,4 +1,3 @@
using k8s.Models;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace k8s namespace k8s

3
src/KubernetesClient/KubernetesMetricsExtensions.cs
View File

@@ -1,6 +1,3 @@
using k8s.Models;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {
/// <summary> /// <summary>

3
src/KubernetesClient/LeaderElection/ILock.cs
View File

@@ -1,6 +1,3 @@
using System.Threading;
using System.Threading.Tasks;
namespace k8s.LeaderElection namespace k8s.LeaderElection
{ {
/// <summary> /// <summary>

3
src/KubernetesClient/LeaderElection/LeaderElector.cs
View File

@@ -1,7 +1,4 @@
using k8s.Autorest;
using System.Net; using System.Net;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.LeaderElection namespace k8s.LeaderElection
{ {

4
src/KubernetesClient/LeaderElection/ResourceLock/ConfigMapLock.cs
View File

@@ -1,7 +1,3 @@
using k8s.Models;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.LeaderElection.ResourceLock namespace k8s.LeaderElection.ResourceLock
{ {
public class ConfigMapLock : MetaObjectAnnotationLock<V1ConfigMap> public class ConfigMapLock : MetaObjectAnnotationLock<V1ConfigMap>

4
src/KubernetesClient/LeaderElection/ResourceLock/EndpointsLock.cs
View File

@@ -1,7 +1,3 @@
using k8s.Models;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.LeaderElection.ResourceLock namespace k8s.LeaderElection.ResourceLock
{ {
public class EndpointsLock : MetaObjectAnnotationLock<V1Endpoints> public class EndpointsLock : MetaObjectAnnotationLock<V1Endpoints>

4
src/KubernetesClient/LeaderElection/ResourceLock/LeaseLock.cs
View File

@@ -1,7 +1,3 @@
using k8s.Models;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.LeaderElection.ResourceLock namespace k8s.LeaderElection.ResourceLock
{ {
public class LeaseLock : MetaObjectLock<V1Lease> public class LeaseLock : MetaObjectLock<V1Lease>

3
src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectAnnotationLock.cs
View File

@@ -1,6 +1,3 @@
using k8s.Models;
namespace k8s.LeaderElection.ResourceLock namespace k8s.LeaderElection.ResourceLock
{ {
public abstract class MetaObjectAnnotationLock<T> : MetaObjectLock<T> public abstract class MetaObjectAnnotationLock<T> : MetaObjectLock<T>

6
src/KubernetesClient/LeaderElection/ResourceLock/MetaObjectLock.cs
View File

@@ -1,9 +1,3 @@
using k8s.Autorest;
using k8s.Models;
using System.Threading;
using System.Threading.Tasks;
namespace k8s.LeaderElection.ResourceLock namespace k8s.LeaderElection.ResourceLock
{ {
public abstract class MetaObjectLock<T> : ILock public abstract class MetaObjectLock<T> : ILock

3
src/KubernetesClient/LeaderElection/ResourceLock/MultiLock.cs
View File

@@ -1,6 +1,3 @@
using System.Threading;
using System.Threading.Tasks;
namespace k8s.LeaderElection.ResourceLock namespace k8s.LeaderElection.ResourceLock
{ {
public class MultiLock : ILock public class MultiLock : ILock

3
src/KubernetesClient/LineSeparatedHttpContent.cs
View File

@@ -1,8 +1,5 @@
using System.IO;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

2
src/KubernetesClient/MuxedStream.cs
View File

@@ -1,5 +1,3 @@
using System.IO;
namespace k8s namespace k8s
{ {
/// <summary> /// <summary>

2
src/KubernetesClient/PrometheusHandler.cs
View File

@@ -1,7 +1,5 @@
using Prometheus; using Prometheus;
using System.Net.Http; using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

3
src/KubernetesClient/StreamDemuxer.cs
View File

@@ -1,9 +1,6 @@
using System.Buffers; using System.Buffers;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

4
src/KubernetesClient/Watcher.cs
View File

@@ -1,9 +1,5 @@
using k8s.Models;
using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

4
src/KubernetesClient/WatcherExt.cs
View File

@@ -1,8 +1,4 @@
using k8s.Autorest;
using k8s.Exceptions; using k8s.Exceptions;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

2
src/KubernetesClient/WebSocketBuilder.cs
View File

@@ -1,7 +1,5 @@
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Threading;
using System.Threading.Tasks;
namespace k8s namespace k8s
{ {

2
src/nuget.proj
View File

@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.Build.Traversal"> <Project Sdk="Microsoft.Build.Traversal">
<ItemGroup> <ItemGroup>
<ProjectReference Include="KubernetesClient.Models/KubernetesClient.Models.csproj" />
<ProjectReference Include="KubernetesClient.Basic/KubernetesClient.Basic.csproj" />
<ProjectReference Include="KubernetesClient/KubernetesClient.csproj" /> <ProjectReference Include="KubernetesClient/KubernetesClient.csproj" />
<ProjectReference Include="KubernetesClient.Classic/KubernetesClient.Classic.csproj" /> <ProjectReference Include="KubernetesClient.Classic/KubernetesClient.Classic.csproj" />
<ProjectReference Include="KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj" /> <ProjectReference Include="KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj" />

2
tests/KubernetesClient.Tests/QuantityValueTests.cs
View File

@@ -217,7 +217,7 @@ namespace k8s.Tests
var value = KubernetesJson.Deserialize<Dictionary<string, ResourceQuantity>>(@"{""cpu"": ""1.1""}"); var value = KubernetesJson.Deserialize<Dictionary<string, ResourceQuantity>>(@"{""cpu"": ""1.1""}");
Assert.Equal(new ResourceQuantity(11, -1, DecimalSI), value["cpu"]); Assert.Equal(new ResourceQuantity(11, -1, DecimalSI), value["cpu"]);
} }
// int // int
{ {
var value = KubernetesJson.Deserialize<Dictionary<string, ResourceQuantity>>(@"{""cpu"": 1}"); var value = KubernetesJson.Deserialize<Dictionary<string, ResourceQuantity>>(@"{""cpu"": 1}");

2
version.json
View File

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