Skip to content

Commit 013fc6e

Browse files
tg123tg123
authored
embed KubernetesClient.Models and KubernetesClient.Basic into client sdk (#1407)
* cleanup using * cleanup classic * clean up nuget * bump ver * fix pipeline * remove commit by accident
1 parent 80c1315 commit 013fc6e

Some content is hidden

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

59 files changed

+172
-220
lines changed

‎.github/workflows/buildtest.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ jobs:
5252
with:
5353
dotnet-version: '7.0.x'
5454
- name: Restore nugets (msbuild)
55-
run: msbuild .\src\KubernetesClient.Models\ -t:restore -p:RestorePackagesConfig=true
55+
run: msbuild .\src\KubernetesClient\ -t:restore -p:RestorePackagesConfig=true
5656
- name: Build (msbuild)
57-
run: msbuild .\src\KubernetesClient.Models\
57+
run: msbuild .\src\KubernetesClient\
5858

5959
e2e:
6060
runs-on: ubuntu-latest

‎.github/workflows/nuget.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ jobs:
4444
matrix:
4545
nuget-package:
4646
- "KubernetesClient"
47-
- "KubernetesClient.Models"
48-
- "KubernetesClient.Basic"
4947
- "KubernetesClient.Classic"
5048
runs-on: ubuntu-latest
5149
permissions:

‎kubernetes-client.sln‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus", "examples\prom
4747
EndProject
4848
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "yaml", "examples\yaml\yaml.csproj", "{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}"
4949
EndProject
50-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Models", "src\KubernetesClient.Models\KubernetesClient.Models.csproj", "{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}"
51-
EndProject
52-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Basic", "src\KubernetesClient.Basic\KubernetesClient.Basic.csproj", "{927995F5-05CC-4078-8805-8E6CC06914D8}"
53-
EndProject
5450
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Classic", "src\KubernetesClient.Classic\KubernetesClient.Classic.csproj", "{80F19E8A-F097-4AA4-A68C-D417B96BBC68}"
5551
EndProject
5652
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
311307
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x64.Build.0 = Release|Any CPU
312308
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.ActiveCfg = Release|Any CPU
313309
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.Build.0 = Release|Any CPU
314-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
315-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
316-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x64.ActiveCfg = Debug|Any CPU
317-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x64.Build.0 = Debug|Any CPU
318-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x86.ActiveCfg = Debug|Any CPU
319-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Debug|x86.Build.0 = Debug|Any CPU
320-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
321-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|Any CPU.Build.0 = Release|Any CPU
322-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x64.ActiveCfg = Release|Any CPU
323-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x64.Build.0 = Release|Any CPU
324-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x86.ActiveCfg = Release|Any CPU
325-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8}.Release|x86.Build.0 = Release|Any CPU
326-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
327-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
328-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x64.ActiveCfg = Debug|Any CPU
329-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x64.Build.0 = Debug|Any CPU
330-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x86.ActiveCfg = Debug|Any CPU
331-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Debug|x86.Build.0 = Debug|Any CPU
332-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
333-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|Any CPU.Build.0 = Release|Any CPU
334-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x64.ActiveCfg = Release|Any CPU
335-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x64.Build.0 = Release|Any CPU
336-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x86.ActiveCfg = Release|Any CPU
337-
{927995F5-05CC-4078-8805-8E6CC06914D8}.Release|x86.Build.0 = Release|Any CPU
338310
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
339311
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|Any CPU.Build.0 = Debug|Any CPU
340312
{80F19E8A-F097-4AA4-A68C-D417B96BBC68}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -491,8 +463,6 @@ Global
491463
{DFBB1025-BD22-459D-A04D-E2AB31E129E2} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
492464
{682B94E4-1761-48FF-B5D0-87B45DC0C735} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
493465
{17AB0AD8-6C90-42DD-880C-16B5AC4A373F} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
494-
{F066A4D8-2EF0-4C07-AC0D-BD325DE3FFA8} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
495-
{927995F5-05CC-4078-8805-8E6CC06914D8} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
496466
{80F19E8A-F097-4AA4-A68C-D417B96BBC68} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
497467
{FD90C861-56C6-4536-B7F5-AC7779296384} = {8AF4A5C2-F0CE-47D5-A4C5-FE4AB83CA509}
498468
{F626860C-F141-45B3-9DDD-88AD3932ACAF} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}

‎src/KubernetesClient.Basic/AbstractKubernetes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ private static class HttpMethods
1515
public static readonly HttpMethod Put = HttpMethod.Put;
1616
public static readonly HttpMethod Trace = HttpMethod.Trace;
1717

18-
#if NETSTANDARD2_0
18+
#if NETSTANDARD2_0 || NET48
1919
public static readonly HttpMethod Patch = new HttpMethod("PATCH");
2020
#else
2121
public static readonly HttpMethod Patch = HttpMethod.Patch;

‎src/KubernetesClient.Basic/KubernetesClient.Basic.csproj‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/KubernetesClient.Classic/CertUtils.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Org.BouncyCastle.Pkcs;
77
using Org.BouncyCastle.Security;
88
using Org.BouncyCastle.X509;
9-
using System.IO;
109
using System.Security.Cryptography.X509Certificates;
1110

1211
namespace k8s

‎src/KubernetesClient.Classic/Global.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
global using k8s.Autorest;
2+
global using k8s.Models;
13
global using System;
24
global using System.Collections.Generic;
5+
global using System.IO;
36
global using System.Linq;
47
global using System.Text.Json;
58
global using System.Text.Json.Serialization;
9+
global using System.Threading;
10+
global using System.Threading.Tasks;

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

Lines changed: 72 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,70 @@
1010
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
1111
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
1212
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
13+
<PackageReference Include="Fractions" Version="7.2.1" />
14+
<PackageReference Include="YamlDotNet" Version="13.3.1" />
15+
<PackageReference Include="System.Text.Json" Version="7.0.3" />
1316
</ItemGroup>
14-
17+
1518
<ItemGroup>
16-
<ProjectReference Include="..\KubernetesClient.Models\KubernetesClient.Models.csproj" />
17-
<ProjectReference Include="..\KubernetesClient.Basic\KubernetesClient.Basic.csproj" />
19+
<Compile Include="..\KubernetesClient.Models\ContainerMetrics.cs" />
20+
<Compile Include="..\KubernetesClient.Models\Extensions.cs" />
21+
<Compile Include="..\KubernetesClient.Models\FloatEmitter.cs" />
22+
<Compile Include="..\KubernetesClient.Models\GeneratedModelVersion.cs" />
23+
<Compile Include="..\KubernetesClient.Models\IItems.cs" />
24+
<Compile Include="..\KubernetesClient.Models\IKubernetesObject.cs" />
25+
<Compile Include="..\KubernetesClient.Models\IMetadata.cs" />
26+
<Compile Include="..\KubernetesClient.Models\IntOrStringJsonConverter.cs" />
27+
<Compile Include="..\KubernetesClient.Models\IntOrStringYamlConverter.cs" />
28+
<Compile Include="..\KubernetesClient.Models\IntstrIntOrString.cs" />
29+
<Compile Include="..\KubernetesClient.Models\ISpec.cs" />
30+
<Compile Include="..\KubernetesClient.Models\IStatus.cs" />
31+
<Compile Include="..\KubernetesClient.Models\IValidate.cs" />
32+
<Compile Include="..\KubernetesClient.Models\KubernetesEntityAttribute.cs" />
33+
<Compile Include="..\KubernetesClient.Models\KubernetesJson.cs" />
34+
<Compile Include="..\KubernetesClient.Models\KubernetesList.cs" />
35+
<Compile Include="..\KubernetesClient.Models\KubernetesObject.cs" />
36+
<Compile Include="..\KubernetesClient.Models\KubernetesYaml.cs" />
37+
<Compile Include="..\KubernetesClient.Models\ModelExtensions.cs" />
38+
<Compile Include="..\KubernetesClient.Models\ModelVersionConverter.cs" />
39+
<Compile Include="..\KubernetesClient.Models\NodeMetrics.cs" />
40+
<Compile Include="..\KubernetesClient.Models\NodeMetricsList.cs" />
41+
<Compile Include="..\KubernetesClient.Models\PodMetrics.cs" />
42+
<Compile Include="..\KubernetesClient.Models\PodMetricsList.cs" />
43+
<Compile Include="..\KubernetesClient.Models\ResourceQuantity.cs" />
44+
<Compile Include="..\KubernetesClient.Models\ResourceQuantityJsonConverter.cs" />
45+
<Compile Include="..\KubernetesClient.Models\ResourceQuantityYamlConverter.cs" />
46+
<Compile Include="..\KubernetesClient.Models\StringQuotingEmitter.cs" />
47+
<Compile Include="..\KubernetesClient.Models\V1Patch.cs" />
48+
<Compile Include="..\KubernetesClient.Models\V1PatchJsonConverter.cs" />
49+
<Compile Include="..\KubernetesClient.Models\V1PodTemplateSpec.cs" />
50+
<Compile Include="..\KubernetesClient.Models\V1Status.cs" />
51+
<Compile Include="..\KubernetesClient.Models\V1Status.ObjectView.cs" />
52+
53+
54+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ClusterEndpoint.cs" />
55+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\Context.cs" />
56+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ContextDetails.cs" />
57+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ExecCredentialResponse.cs" />
58+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\ExternalExecution.cs" />
59+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\K8SConfiguration.cs" />
60+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\NamedExtension.cs" />
61+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\User.cs" />
62+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\UserCredentials.cs" />
63+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\Cluster.cs" />
64+
<Compile Include="..\KubernetesClient.Models\KubeConfigModels\AuthProvider.cs" />
65+
66+
</ItemGroup>
67+
<ItemGroup>
68+
<Compile Include="..\KubernetesClient.Basic\AbstractKubernetes.cs" />
69+
<Compile Include="..\KubernetesClient.Basic\GeneratedApiVersion.cs" />
70+
71+
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpExtensions.cs" />
72+
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpMessageWrapper.cs" />
73+
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpOperationException.cs" />
74+
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpOperationResponse.cs" />
75+
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpRequestMessageWrapper.cs" />
76+
<Compile Include="..\KubernetesClient.Basic\Autorest\HttpResponseMessageWrapper.cs" />
1877
</ItemGroup>
1978

2079
<ItemGroup>
@@ -59,8 +118,16 @@
59118
<Compile Include="..\KubernetesClient\Authentication\StringTokenProvider.cs" />
60119
<Compile Include="..\KubernetesClient\Authentication\TokenCredentials.cs" />
61120
</ItemGroup>
62-
121+
63122
<ItemGroup>
64123
<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'net48'" />
65124
</ItemGroup>
66-
</Project>
125+
126+
<ItemGroup>
127+
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="Generator" />
128+
<AdditionalFiles Include="..\..\swagger.json"
129+
Generator="model,modelext,api,version,versionconverterstub" />
130+
<ProjectReference Include="..\LibKubernetesGenerator\LibKubernetesGenerator.csproj"
131+
OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
132+
</ItemGroup>
133+
</Project>

‎src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<ProjectReference Include="..\KubernetesClient.Models\KubernetesClient.Models.csproj" />
14+
<ProjectReference Include="..\KubernetesClient\KubernetesClient.csproj" />
1515
<PackageReference Include="AutoMapper" Version="12.0.1" />
1616
</ItemGroup>
1717
</Project>

‎src/KubernetesClient.Models/Extensions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using k8s.Models;
21
using System.Reflection;
32
using System.Text.RegularExpressions;
43

0 commit comments

Comments
 (0)