Skip to content

Commit 45a9527

Browse files
committed
fixes crd validation precheck
1 parent a8139ed commit 45a9527

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ docker run \
2525
-v "$(pwd)":"$(pwd)" \
2626
-ti \
2727
--network host \
28-
docker.pkg.github.com/kubernetes-client/java/crd-model-gen:v1.0.0 \
28+
docker.pkg.github.com/kubernetes-client/java/crd-model-gen:v1.0.1 \
2929
/generate.sh \
3030
-u https://github.com/jetstack/cert-manager/releases/download/v0.16.1/cert-manager.crds.yaml \
3131
-n io.cert-manager \

client-java-contrib/generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ kubectl get crd -o name \
6060
echo "$L failed publishing openapi schema because it's attached non-structral-schema condition."
6161
exit 1
6262
fi
63-
if [[ $(kubectl get $L -o jsonpath='{.preserveUnknownFields}') == "true" ]]; then
63+
if [[ $(kubectl get $L -o jsonpath='{.spec.preserveUnknownFields}') == "true" ]]; then
6464
echo "$L failed publishing openapi schema because it explicitly disabled unknown fields pruning."
6565
exit 1
6666
fi

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
# This script generates the model classes from a released version of cert-manager CRDs
1717
# under src/main/java/io/cert/manager/models.
1818

19-
# build the crdgen image which includes all the toolchains needed for code generation
20-
docker build .. -t crdgen
21-
2219
# a crdgen container is run in a way that:
2320
# 1. it has access to the docker daemon on the host so that it is able to create sibling container on the host
2421
# 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 \
2825
-v "$(pwd)":"$(pwd)" \
2926
-ti \
3027
--network host \
31-
crdgen /generate.sh \
28+
docker.pkg.github.com/kubernetes-client/java/crd-model-gen:v1.0.1 \
29+
/generate.sh \
3230
-u https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.38.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml \
3331
-u https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.38.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml \
3432
-u https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.38.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml \

0 commit comments

Comments
 (0)