Merge pull request #1272 from yue9944882/fixes-failing-codegen-test

Fixes failing codegen CI test
kubernetes-client · Sep 16, 2020 · 0a3af96 · 0a3af96
2 parents d780a9b + d90c8b3
commit 0a3af96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -72,6 +72,7 @@ jobs:
           - 5000:5000
     name: CRD Java Models Code Generation
     steps:
+      - uses: actions/checkout@v2
       - name: Publish to Registry
         uses: elgohr/Publish-Docker-Github-Action@master
         with:

diff --git a/client-java-contrib/cert-manager/update.sh b/client-java-contrib/cert-manager/update.sh
@@ -16,8 +16,10 @@
 # This script generates the model classes from a released version of cert-manager CRDs
 # under src/main/java/io/cert/manager/models.
 
-IMAGE_NAME=${IMAGE_NAME:docker.pkg.github.com/kubernetes-client/java/crd-model-gen}
-IMAGE_TAG=${IMAGE_TAG:v1.0.2}
+DEFAULT_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
+DEFAULT_IMAGE_TAG=v1.0.2
+IMAGE_NAME=${IMAGE_NAME:=$DEFAULT_IMAGE_NAME}
+IMAGE_TAG=${IMAGE_TAG:=$DEFAULT_IMAGE_TAG}
 
 # 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

diff --git a/client-java-contrib/prometheus-operator/update.sh b/client-java-contrib/prometheus-operator/update.sh
@@ -16,8 +16,10 @@
 # This script generates the model classes from a released version of cert-manager CRDs
 # under src/main/java/io/cert/manager/models.
 
-IMAGE_NAME=${IMAGE_NAME:docker.pkg.github.com/kubernetes-client/java/crd-model-gen}
-IMAGE_TAG=${IMAGE_TAG:v1.0.2}
+DEFAULT_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
+DEFAULT_IMAGE_TAG=v1.0.2
+IMAGE_NAME=${IMAGE_NAME:=$DEFAULT_IMAGE_NAME}
+IMAGE_TAG=${IMAGE_TAG:=$DEFAULT_IMAGE_TAG}
 
 # 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