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

* 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
kubernetes-client · Apr 29, 2024 · 07a59e7 · 07a59e7
1 parent 3dae1cf
commit 07a59e7
Show file tree

Hide file tree

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

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -29,9 +29,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          3.1.x
           6.0.x
-          7.0.x
           8.0.x
 
     # Initializes the CodeQL tools for scanning.

diff --git a/.github/workflows/docfx.yaml b/.github/workflows/docfx.yaml
@@ -34,7 +34,6 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.x
           8.0.x
 
     - name: Build

diff --git a/.github/workflows/draft.yaml b/.github/workflows/draft.yaml
@@ -19,7 +19,6 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.x
           8.0.x
 
     - name: dotnet restore
@@ -37,4 +36,4 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        gh release create -d --generate-notes v$env:NBGV_NuGetPackageVersion
+        gh release create -d --generate-notes v$env:NBGV_NuGetPackageVersion
diff --git a/.github/workflows/nuget.yaml b/.github/workflows/nuget.yaml
@@ -19,7 +19,6 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.x
           8.0.x
 
     - name: dotnet restore

diff --git a/README.md b/README.md
@@ -154,6 +154,7 @@ ${GEN_DIR}/openapi/csharp.sh ${REPO_DIR}/src/KubernetesClient ${REPO_DIR}/csharp
 
 | 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*         |
 | 12.0        | 1.28               | net6.0;net7.0;net48*;netstandard2.0*                |
 | 11.0        | 1.27               | net6.0;net7.0;net48*;netstandard2.0*                |

diff --git a/csharp.settings b/csharp.settings
@@ -1,3 +1,3 @@
-export KUBERNETES_BRANCH=v1.29.0
+export KUBERNETES_BRANCH=v1.30.0
 export CLIENT_VERSION=0.0.1
 export PACKAGE_NAME=k8s
diff --git a/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj b/src/KubernetesClient.Kubectl/KubernetesClient.Kubectl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>k8s.kubectl</RootNamespace>

diff --git a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <RootNamespace>k8s.ModelConverter</RootNamespace>
   </PropertyGroup>
 

diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <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>
     </PropertyGroup>
 

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