bluecodecc
diff --git a/‎client-java-contrib/Dockerfile‎
Lines changed: 3 additions & 5 deletions b/‎client-java-contrib/Dockerfile‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎client-java-contrib/Dockerfile.gen‎
Lines changed: 0 additions & 13 deletions b/‎client-java-contrib/Dockerfile.gen‎
Lines changed: 0 additions & 13 deletions
diff --git a/‎client-java-contrib/Dockerfile.gen-base‎
Lines changed: 0 additions & 43 deletions b/‎client-java-contrib/Dockerfile.gen-base‎
Lines changed: 0 additions & 43 deletions
diff --git a/‎client-java-contrib/generate.sh‎
Lines changed: 1 addition & 0 deletions b/‎client-java-contrib/generate.sh‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎client-java-contrib/publish-gen-image.sh‎
Lines changed: 1 addition & 7 deletions b/‎client-java-contrib/publish-gen-image.sh‎
Lines changed: 1 addition & 7 deletions
@@ -2,17 +2,15 @@ FROM docker:stable
 
 # install git, bash, kind, kubectl and clone the kubernetes-client/gen code base
 RUN apk add --no-cache git bash && \
-    wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64 && \
+    wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-amd64 && \
     chmod +x /usr/bin/kind && \
-    wget -O /usr/bin/kubectl https://dl.k8s.io/release/v1.26.4/bin/linux/amd64/kubectl && \
+    wget -O /usr/bin/kubectl https://dl.k8s.io/release/v1.28.2/bin/linux/amd64/kubectl && \
     chmod +x /usr/bin/kubectl && \
     git clone https://github.com/kubernetes-client/gen.git && \
     cd gen && \
-    git checkout 729332ad08f0f4d98983b7beb027e2f657236ef9
-    # 729332ad08f0f4d98983b7beb027e2f657236ef9 is the last commit using python2 interpreter
+    git checkout 84f2bc9e34129f92606a00fccb8c5c62204012b9
 
 
-COPY Dockerfile.gen gen/openapi/openapi-generator/Dockerfile
 COPY generate.sh generate.sh
 
 RUN chmod +x generate.sh
 
@@ -88,4 +88,5 @@ bash java-crd-cmd.sh -n "${KUBERNETES_CRD_GROUP_PREFIX}" -p "${PACKAGE_NAME}" -l
 # only keep the model classes
 mkdir -p "${OUTPUT_DIR}/src/main/java/${PACKAGE_NAME//.//}"
 cp -r "${OUTPUT_DIR}/gen/src/main/java/${PACKAGE_NAME//.//}/models" "${OUTPUT_DIR}/src/main/java/${PACKAGE_NAME//.//}"
+rm "${OUTPUT_DIR}/src/main/java/${PACKAGE_NAME//.//}/models/AbstractOpenApiSchema.java" # probably caused by https://github.com/OpenAPITools/openapi-generator/issues/16257
 rm -rf "${OUTPUT_DIR}/gen"
@@ -1,13 +1,7 @@
 #!/usr/bin/env bash
 
-GEN_BASE_IMAGE_NAME=ghcr.io/yue9944882/crd-model-gen-base  # TODO: move this to kubernetes-client group after the permission issue fixed
-GEN_BASE_IMAGE_VERSION=v1.0.0
-
-docker build -t ${GEN_BASE_IMAGE_NAME}:${GEN_BASE_IMAGE_VERSION} .
-docker push ${GEN_BASE_IMAGE_NAME}:${GEN_BASE_IMAGE_VERSION}
-
 GEN_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
-GEN_IMAGE_VERSION=v1.0.6
+GEN_IMAGE_VERSION=v1.0.7
 
 docker build -t ${GEN_IMAGE_NAME}:${GEN_IMAGE_VERSION} .
 docker push ${GEN_IMAGE_NAME}:${GEN_IMAGE_VERSION}