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

Update SDK version to 14.0 for Kubernetes 1.30 (#1551)

Browse Source 
* Update KUBERNETES_BRANCH to v1.30.0 in csharp.settings

* Update version.json to 14.0

* Update SDK version to 14.0 for Kubernetes 1.30

* fix csharp naming conflict

* drop support of net7

* remove unused comment
This commit is contained in:
Boshi Lian
2024-04-28 17:00:18 -07:00
committed by GitHub
parent 3dae1cf299
commit 07a59e7e59
17 changed files with 7395 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@ jobs:
with: with:
dotnet-version: | dotnet-version: |
6.0.x 6.0.x
7.0.x
8.0.x 8.0.x
# - name: Check Format # - name: Check Format
# # don't check formatting on Windows b/c of CRLF issues. # # don't check formatting on Windows b/c of CRLF issues.
@@ -48,10 +47,10 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Add msbuild to PATH - name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2 uses: microsoft/setup-msbuild@v2
- name: Setup dotnet SDK 7 - name: Setup dotnet SDK
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: '7.0.x' dotnet-version: '8.0.x'
- name: Restore nugets (msbuild) - name: Restore nugets (msbuild)
run: msbuild .\src\KubernetesClient\ -t:restore -p:RestorePackagesConfig=true run: msbuild .\src\KubernetesClient\ -t:restore -p:RestorePackagesConfig=true
- name: Build (msbuild) - name: Build (msbuild)
@@ -68,7 +67,6 @@ jobs:
with: with:
dotnet-version: | dotnet-version: |
6.0.x 6.0.x
7.0.x
8.0.x 8.0.x
- name: Minikube - name: Minikube
run: minikube start run: minikube start

2
.github/workflows/codeql-analysis.yml vendored
View File

@@ -29,9 +29,7 @@ jobs:
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: | dotnet-version: |
3.1.x
6.0.x 6.0.x
7.0.x
8.0.x 8.0.x
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.

1
.github/workflows/docfx.yaml vendored
View File

@@ -34,7 +34,6 @@ jobs:
with: with:
dotnet-version: | dotnet-version: |
6.0.x 6.0.x
7.0.x
8.0.x 8.0.x
- name: Build - name: Build

3
.github/workflows/draft.yaml vendored
View File

@@ -19,7 +19,6 @@ jobs:
with: with:
dotnet-version: | dotnet-version: |
6.0.x 6.0.x
7.0.x
8.0.x 8.0.x
- name: dotnet restore - name: dotnet restore
@@ -37,4 +36,4 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
gh release create -d --generate-notes v$env:NBGV_NuGetPackageVersion gh release create -d --generate-notes v$env:NBGV_NuGetPackageVersion

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

@@ -19,7 +19,6 @@ jobs:
with: with:
dotnet-version: | dotnet-version: |
6.0.x 6.0.x
7.0.x
8.0.x 8.0.x
- name: dotnet restore - name: dotnet restore

1
README.md
View File

@@ -154,6 +154,7 @@ ${GEN_DIR}/openapi/csharp.sh ${REPO_DIR}/src/KubernetesClient ${REPO_DIR}/csharp
| SDK Version | Kubernetes Version | .NET Targeting | | SDK Version | Kubernetes Version | .NET Targeting |
|-------------|--------------------|-----------------------------------------------------| |-------------|--------------------|-----------------------------------------------------|
| 14.0 | 1.30 | net6.0;net8.0;net48*;netstandard2.0* |
| 13.0 | 1.29 | net6.0;net7.0;net8.0;net48*;netstandard2.0* | | 13.0 | 1.29 | net6.0;net7.0;net8.0;net48*;netstandard2.0* |
| 12.0 | 1.28 | net6.0;net7.0;net48*;netstandard2.0* | | 12.0 | 1.28 | net6.0;net7.0;net48*;netstandard2.0* |
| 11.0 | 1.27 | net6.0;net7.0;net48*;netstandard2.0* | | 11.0 | 1.27 | net6.0;net7.0;net48*;netstandard2.0* |

2
csharp.settings
View File

@@ -1,3 +1,3 @@
export KUBERNETES_BRANCH=v1.29.0 export KUBERNETES_BRANCH=v1.30.0
export CLIENT_VERSION=0.0.1 export CLIENT_VERSION=0.0.1
export PACKAGE_NAME=k8s export PACKAGE_NAME=k8s

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

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>k8s.kubectl</RootNamespace> <RootNamespace>k8s.kubectl</RootNamespace>

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

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<RootNamespace>k8s.ModelConverter</RootNamespace> <RootNamespace>k8s.ModelConverter</RootNamespace>
</PropertyGroup> </PropertyGroup>

5
src/KubernetesClient/KubernetesClient.csproj
View File

@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<RootNamespace>k8s</RootNamespace> <RootNamespace>k8s</RootNamespace>
<!-- seems bug in net7 json generator, some types missing in its result
net8 is still in preview, will enable it after net8 release -->
<!-- <PublishAot Condition="'$(TargetFramework)' == 'net8.0'">true</PublishAot> -->
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles> <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
</PropertyGroup> </PropertyGroup>

82
src/LibKubernetesGenerator/GeneralNameHelper.cs
View File

@@ -78,57 +78,51 @@ namespace LibKubernetesGenerator
switch (style) switch (style)
{ {
case "parameter": case "parameter":
if (jsonName == "namespace") switch (jsonName)
{ {
return "namespaceParameter"; case "namespace":
} return "namespaceParameter";
else if (jsonName == "continue") case "continue":
{ return "continueParameter";
return "continueParameter"; default:
break;
} }
break; break;
case "fieldctor": case "fieldctor":
if (jsonName == "namespace")
switch (jsonName)
{ {
return "namespaceProperty"; case "namespace":
} return "namespaceProperty";
else if (jsonName == "continue") case "continue":
{ return "continueProperty";
return "continueProperty"; case "$ref":
} return "refProperty";
else if (jsonName == "$ref") case "default":
{ return "defaultProperty";
return "refProperty"; case "operator":
} return "operatorProperty";
else if (jsonName == "default") case "$schema":
{ return "schema";
return "defaultProperty"; case "enum":
} return "enumProperty";
else if (jsonName == "operator") case "object":
{ return "objectProperty";
return "operatorProperty"; case "readOnly":
} return "readOnlyProperty";
else if (jsonName == "$schema") case "from":
{ return "fromProperty";
return "schema"; case "int":
} return "intValue";
else if (jsonName == "enum") case "bool":
{ return "boolValue";
return "enumProperty"; case "string":
} return "stringValue";
else if (jsonName == "object")
{ default:
return "objectProperty"; break;
}
else if (jsonName == "readOnly")
{
return "readOnlyProperty";
}
else if (jsonName == "from")
{
return "fromProperty";
} }
if (jsonName.Contains("-")) if (jsonName.Contains("-"))

7512
swagger.json
View File

File diff suppressed because it is too large Load Diff

2
tests/E2E.Tests/E2E.Tests.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<RootNamespace>k8s.E2E</RootNamespace> <RootNamespace>k8s.E2E</RootNamespace>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
tests/Kubectl.Tests/Kubectl.Tests.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>

4
tests/KubernetesClient.Classic.Tests/KubernetesClient.Classic.Tests.csproj
View File

@@ -2,8 +2,8 @@
<PropertyGroup> <PropertyGroup>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<RootNamespace>k8s.Tests</RootNamespace> <RootNamespace>k8s.Tests</RootNamespace>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net6.0;net7.0;net8.0;net48</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net6.0;net8.0;net48</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<RootNamespace>k8s.Tests</RootNamespace> <RootNamespace>k8s.Tests</RootNamespace>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

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": "13.0", "version": "14.0",
"publicReleaseRefSpec": [ "publicReleaseRefSpec": [
"^refs/heads/master$", "^refs/heads/master$",
"^refs/tags/v\\d+\\.\\d+\\.\\d+" "^refs/tags/v\\d+\\.\\d+\\.\\d+"