Merge pull request #21 from kubernetes-client/fix-release-version

Fix default codegen version

openapi/client-generator.sh

@@ -39,7 +39,7 @@ kubeclient::generator::generate_client() {
     : "${PACKAGE_NAME?Must set PACKAGE_NAME env var}"
     : "${CLIENT_LANGUAGE?Must set CLIENT_LANGUAGE env var}"
 
-    SWAGGER_CODEGEN_COMMIT="${SWAGGER_CODEGEN_COMMIT:-v2.3.0}"
+    SWAGGER_CODEGEN_COMMIT="${SWAGGER_CODEGEN_COMMIT:-v2.2.3}"
 
     local output_dir=$1
     pushd "${output_dir}" > /dev/null
@@ -64,10 +64,10 @@ kubeclient::generator::generate_client() {
     echo "--- Running generator inside container..."
     docker run \
         -e CLEANUP_DIRS="${CLEANUP_DIRS_STRING}" \
-        -e KUBERNETES_BRANCH \
-        -e CLIENT_VERSION \
-        -e PACKAGE_NAME \
-        -e SWAGGER_CODEGEN_COMMIT \
+        -e KUBERNETES_BRANCH="${KUBERNETES_BRANCH}" \
+        -e CLIENT_VERSION="${CLIENT_VERSION}" \
+        -e PACKAGE_NAME="${PACKAGE_NAME}" \
+        -e SWAGGER_CODEGEN_COMMIT="${SWAGGER_CODEGEN_COMMIT}" \
         -v "${output_dir}:/output_dir" \
         "kubernetes-${CLIENT_LANGUAGE}-client-gen:v1" "/output_dir"
 

openapi/java.sh

@@ -47,7 +47,7 @@ popd > /dev/null
 source "${SCRIPT_ROOT}/client-generator.sh"
 source "${SETTING_FILE}"
 
-SWAGGER_CODEGEN_COMMIT=5d263e1c9cdd395d93adf061c63d5ef58a8e9ec5 \
-CLIENT_LANGUAGE=java \
-CLEANUP_DIRS=(docs src/test src/main/java/io/kubernetes/client/apis src/main/java/io/kubernetes/client/models src/main/java/io/kubernetes/client/auth gradle) \
+SWAGGER_CODEGEN_COMMIT=5d263e1c9cdd395d93adf061c63d5ef58a8e9ec5; \
+CLIENT_LANGUAGE=java; \
+CLEANUP_DIRS=(docs src/test src/main/java/io/kubernetes/client/apis src/main/java/io/kubernetes/client/models src/main/java/io/kubernetes/client/auth gradle); \
 kubeclient::generator::generate_client "${OUTPUT_DIR}"

openapi/javascript.sh

@@ -43,7 +43,7 @@ popd > /dev/null
 source "${SCRIPT_ROOT}/client-generator.sh"
 source "${SETTING_FILE}"
 
-SWAGGER_CODEGEN_COMMIT=5d263e1c9cdd395d93adf061c63d5ef58a8e9ec5 \
-CLIENT_LANGUAGE=javascript \
-CLEANUP_DIRS=(docs src test) \
+SWAGGER_CODEGEN_COMMIT=5d263e1c9cdd395d93adf061c63d5ef58a8e9ec5; \
+CLIENT_LANGUAGE=javascript; \
+CLEANUP_DIRS=(docs src test); \
 kubeclient::generator::generate_client "${OUTPUT_DIR}"

openapi/python.sh

@@ -44,7 +44,10 @@ popd > /dev/null
 source "${SCRIPT_ROOT}/client-generator.sh"
 source "${SETTING_FILE}"
 
-CLIENT_LANGUAGE=python; CLEANUP_DIRS=(client/apis client/models docs test); kubeclient::generator::generate_client "${OUTPUT_DIR}"
+SWAGGER_CODEGEN_COMMIT=v2.2.2; \
+CLIENT_LANGUAGE=python; \
+CLEANUP_DIRS=(client/apis client/models docs test); \
+kubeclient::generator::generate_client "${OUTPUT_DIR}"
 
 echo "--- Patching generated code..."
 find "${OUTPUT_DIR}/test" -type f -name \*.py -exec sed -i 's/\bclient/kubernetes.client/g' {} +

openapi/ruby.sh

@@ -43,4 +43,6 @@ popd > /dev/null
 source "${SCRIPT_ROOT}/client-generator.sh"
 source "${SETTING_FILE}"
 
-CLIENT_LANGUAGE=ruby; CLEANUP_DIRS=(docs lib spec); kubeclient::generator::generate_client "${OUTPUT_DIR}"
+CLIENT_LANGUAGE=ruby; \
+CLEANUP_DIRS=(docs lib spec); \
+kubeclient::generator::generate_client "${OUTPUT_DIR}"

openapi/typescript.sh

@@ -44,4 +44,6 @@ popd > /dev/null
 source "${SCRIPT_ROOT}/client-generator.sh"
 source "${SETTING_FILE}"
 
-CLIENT_LANGUAGE=typescript; CLEANUP_DIRS=(docs src target gradle); kubeclient::generator::generate_client "${OUTPUT_DIR}"
+CLIENT_LANGUAGE=typescript; \
+CLEANUP_DIRS=(docs src target gradle); \
+kubeclient::generator::generate_client "${OUTPUT_DIR}"