Merge pull request #1241 from yue9944882/fixes-modelgen-precheck

Fixes crd validation precheck: ensure `.spec.preserveUnknownFields` set to false to enable pruning

Author: k8s-ci-robot

client-java-contrib/cert-manager/update.sh

@@ -25,7 +25,7 @@ docker run \
   -v "$(pwd)":"$(pwd)" \
   -ti \
   --network host \
-  docker.pkg.github.com/kubernetes-client/java/crd-model-gen:v1.0.0 \
+  docker.pkg.github.com/kubernetes-client/java/crd-model-gen:v1.0.1 \
   /generate.sh \
   -u https://github.com/jetstack/cert-manager/releases/download/v0.16.1/cert-manager.crds.yaml \
   -n io.cert-manager \

client-java-contrib/generate.sh

@@ -60,7 +60,7 @@ kubectl get crd -o name \
         echo "$L failed publishing openapi schema because it's attached non-structral-schema condition."
         exit 1
       fi
-      if [[ $(kubectl get $L -o jsonpath='{.preserveUnknownFields}') == "true" ]]; then
+      if [[ $(kubectl get $L -o jsonpath='{.spec.preserveUnknownFields}') == "true" ]]; then
         echo "$L failed publishing openapi schema because it explicitly disabled unknown fields pruning."
         exit 1
       fi

client-java-contrib/prometheus-operator/update.sh

@@ -16,9 +16,6 @@
 # This script generates the model classes from a released version of cert-manager CRDs
 # under src/main/java/io/cert/manager/models.
 
-# build the crdgen image which includes all the toolchains needed for code generation
-docker build .. -t crdgen
-
 # a crdgen container is run in a way that:
 #   1. it has access to the docker daemon on the host so that it is able to create sibling container on the host
 #   2. it runs on the host network so that it is able to communicate with the KinD cluster it launched on the host
@@ -28,7 +25,8 @@ docker run \
   -v "$(pwd)":"$(pwd)" \
   -ti \
   --network host \
-  crdgen /generate.sh \
+  docker.pkg.github.com/kubernetes-client/java/crd-model-gen:v1.0.1 \
+  /generate.sh \
   -u https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.38.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml \
   -u https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.38.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml \
   -u https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.38.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml \