Python3 all

.gitignore

@@ -1,4 +1,8 @@
 # Intellij IDEA files
 .idea/*
 *.iml
-
+.venv/
+*.diff
+python-asyncio-client/
+python-client/
+python-pydantic-client/

README.md

@@ -26,10 +26,13 @@ are normally:
 
 Example settings file for python-client:
 
+```shell
 export KUBERNETES_BRANCH="master"
-export CLIENT_VERSION="8.0.0b1"
+export CLIENT_VERSION="31.0.0"
 export PACKAGE_NAME="client"
 
+```
+
 Note: For generating the client for any language, the PACKAGE_NAME should be "client".
       You can use the latest version for the CLIENT_VERSION. It's displayed here for
       the python-client ( https://github.com/kubernetes-client/python ), and similarly

openapi/python-asyncio.sh

@@ -17,6 +17,7 @@
 set -o errexit
 set -o nounset
 set -o pipefail
+set -x
 
 ARGC=$#
 
@@ -57,21 +58,21 @@ echo "--- Patching generated code..."
 if [ ${PACKAGE_NAME} == "client" ]; then
 
   # Post-processing of the generated Python wrapper.
-  find "${OUTPUT_DIR}/test" -type f -name \*.py -exec sed -i 's/\bclient/kubernetes_asyncio.client/g' {} +
-  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec sed -i 's/\bclient/kubernetes_asyncio.client/g' {} +
-  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec sed -i 's/kubernetes_asyncio.client-python/client-python/g' {} +
+  find "${OUTPUT_DIR}/test" -type f -name \*.py -exec gsed -i 's/\bclient/kubernetes_asyncio.client/g' {} +
+  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/\bclient/kubernetes_asyncio.client/g' {} +
+  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/kubernetes_asyncio.client-python/client-python/g' {} +
 
   # fix imports
-  find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec sed -i 's/import client\./import kubernetes_asyncio.client./g' {} +
-  find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec sed -i 's/from client/from kubernetes_asyncio.client/g' {} +
-  find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec sed -i 's/getattr(client\.models/getattr(kubernetes_asyncio.client.models/g' {} +
+  find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/import client\./import kubernetes_asyncio.client./g' {} +
+  find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/from client/from kubernetes_asyncio.client/g' {} +
+  find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/getattr(client\.models/getattr(kubernetes_asyncio.client.models/g' {} +
 
 else
 
   # Post-processing of the generated Python wrapper.
-  find "${OUTPUT_DIR}/test" -type f -name \*.py -exec sed -i "s/\\bclient/${PACKAGE_NAME}.client/g" {} +
-  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec sed -i "s/\\bclient/${PACKAGE_NAME}.client/g" {} +
-  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec sed -i "s/${PACKAGE_NAME}.client-python/client-python/g" {} +
+  find "${OUTPUT_DIR}/test" -type f -name \*.py -exec gsed -i "s/\\bclient/${PACKAGE_NAME}.client/g" {} +
+  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i "s/\\bclient/${PACKAGE_NAME}.client/g" {} +
+  find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i "s/${PACKAGE_NAME}.client-python/client-python/g" {} +
 
 fi
 

openapi/python-asyncio.xml

@@ -19,10 +19,10 @@
                         <configuration>
                             <inputSpec>${generator.spec.path}</inputSpec>
                             <skipValidateSpec>true</skipValidateSpec>
-                            <generatorName>python-legacy</generatorName>
+                            <generatorName>python</generatorName>
                             <library>asyncio</library>
-                            <gitUserId>kubernetes-client</gitUserId>
-                            <gitRepoId>python</gitRepoId>
+                            <gitUserId>kmambo</gitUserId>
+                            <gitRepoId>kubernetes-client-python-asyncio-pydantic-v2</gitRepoId>
                             <configOptions>
                                 <packageName>${generator.package.name}</packageName>
                                 <packageVersion>${generator.client.version}</packageVersion>

openapi/python-pydantic-v1.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+ARGC=$#
+
+if [ $# -ne 2 ]; then
+    echo "Usage:"
+    echo "  $(basename ${0}) OUTPUT_DIR SETTING_FILE_PATH"
+    echo "    Setting file should define KUBERNETES_BRANCH, CLIENT_VERSION, and PACKAGE_NAME"
+    echo "    Setting file can define an optional USERNAME if you're working on a fork"
+    echo "    Setting file can define an optional REPOSITORY if you're working on a ecosystem project"
+    exit 1
+fi
+
+
+OUTPUT_DIR=$1
+SETTING_FILE=$2
+mkdir -p "${OUTPUT_DIR}"
+
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
+pushd "${SCRIPT_ROOT}" > /dev/null
+SCRIPT_ROOT=`pwd`
+popd > /dev/null
+
+pushd "${OUTPUT_DIR}" > /dev/null
+OUTPUT_DIR=`pwd`
+popd > /dev/null
+
+source "${SCRIPT_ROOT}/openapi-generator/client-generator.sh"
+source "${SETTING_FILE}"
+OPENAPI_GENERATOR_COMMIT="${OPENAPI_GENERATOR_COMMIT:-v4.3.0}"
+
+CLIENT_LANGUAGE=python-pydantic-v1; \
+CLEANUP_DIRS=(client/api client/apis client/models docs test); \
+kubeclient::generator::generate_client "${OUTPUT_DIR}"
+
+echo "--- Patching generated code..."
+
+# Post-processing of the generated Python wrapper.
+find "${OUTPUT_DIR}/test" -type f -name \*.py -exec gsed -i 's/\bclient/kubernetes.client/g' {} +
+find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/\bclient/kubernetes.client/g' {} +
+find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/kubernetes.client-python/client-python/g' {} +
+find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/kubernetes-kubernetes.client/kubernetes-client/g' {} +
+
+# fix imports
+if [ "${PACKAGE_NAME}" = client ]; then
+    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/import client\./import kubernetes.client./g' {} +
+    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/from client/from kubernetes.client/g' {} +
+    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/getattr(client\.models/getattr(kubernetes.client.models/g' {} +
+fi
+
+echo "---Done."

openapi/python-pydantic-v1.xml

@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.kubernetes</groupId>
+    <artifactId>client-python</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>client-python</name>
+    <url>http://kubernetes.io</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <version>${openapi-generator-version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${generator.spec.path}</inputSpec>
+                            <generatorName>python-pydantic-v1</generatorName>
+                            <gitUserId>kmambo</gitUserId>
+                            <gitRepoId>kubernetes-client-python-pydantic-v1</gitRepoId>
+                            <skipValidateSpec>true</skipValidateSpec>
+                            <configOptions>
+                                <packageName>${generator.package.name}</packageName>
+                                <packageVersion>${generator.client.version}</packageVersion>
+                                <sortParamsByRequiredFlag>true</sortParamsByRequiredFlag>
+                            </configOptions>
+                            <output>${generator.output.path}</output>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- dependencies are needed for the client being generated -->
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+    </dependencies>
+    <properties>
+        <swagger-annotations-version>1.5.0</swagger-annotations-version>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+
+        <!-- Default values for the generator parameters. -->
+        <generator.output.path>.</generator.output.path>
+        <generator.spec.path>swagger.json</generator.spec.path>
+        <generator.package.name>swagger_client</generator.package.name>
+        <generator.client.version>unversioned</generator.client.version>
+    </properties>
+</project>

openapi/python.sh

@@ -17,6 +17,7 @@
 set -o errexit
 set -o nounset
 set -o pipefail
+set -x
 
 ARGC=$#
 
@@ -54,16 +55,16 @@ kubeclient::generator::generate_client "${OUTPUT_DIR}"
 echo "--- Patching generated code..."
 
 # Post-processing of the generated Python wrapper.
-find "${OUTPUT_DIR}/test" -type f -name \*.py -exec sed -i 's/\bclient/kubernetes.client/g' {} +
-find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec sed -i 's/\bclient/kubernetes.client/g' {} +
-find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec sed -i 's/kubernetes.client-python/client-python/g' {} +
-find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec sed -i 's/kubernetes-kubernetes.client/kubernetes-client/g' {} +
+find "${OUTPUT_DIR}/test" -type f -name \*.py -exec gsed -i 's/\bclient/kubernetes.client/g' {} +
+find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/\bclient/kubernetes.client/g' {} +
+find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/kubernetes.client-python/client-python/g' {} +
+find "${OUTPUT_DIR}" -path "${OUTPUT_DIR}/base" -prune -o -type f -a -name \*.md -exec gsed -i 's/kubernetes-kubernetes.client/kubernetes-client/g' {} +
 
 # fix imports
 if [ "${PACKAGE_NAME}" = client ]; then
-    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec sed -i 's/import client\./import kubernetes.client./g' {} +
-    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec sed -i 's/from client/from kubernetes.client/g' {} +
-    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec sed -i 's/getattr(client\.models/getattr(kubernetes.client.models/g' {} +
+    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/import client\./import kubernetes.client./g' {} +
+    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/from client/from kubernetes.client/g' {} +
+    find "${OUTPUT_DIR}/client/" -type f -name \*.py -exec gsed -i 's/getattr(client\.models/getattr(kubernetes.client.models/g' {} +
 fi
 
 echo "---Done."

openapi/python.xml

@@ -19,8 +19,8 @@
                         <configuration>
                             <inputSpec>${generator.spec.path}</inputSpec>
                             <generatorName>python</generatorName>
-                            <gitUserId>kubernetes-client</gitUserId>
-                            <gitRepoId>python</gitRepoId>
+                            <gitUserId>kmambo</gitUserId>
+                            <gitRepoId>kubernetes-client-python</gitRepoId>
                             <skipValidateSpec>true</skipValidateSpec>
                             <configOptions>
                                 <packageName>${generator.package.name}</packageName>

python-settings.sh

@@ -0,0 +1,4 @@
+export KUBERNETES_BRANCH="master" 
+export CLIENT_VERSION="31.0.0"
+export PACKAGE_NAME="client"
+export OPENAPI_GENERATOR_COMMIT=v7.10.0