Skip to content

Commit 58cf34f

Browse files
committed
pin crd-gen to v1.0.6 to make CI pass
1 parent c40a928 commit 58cf34f

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

client-java-contrib/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ FROM docker:stable
22

33
# install git, bash, kind, kubectl and clone the kubernetes-client/gen code base
44
RUN apk add --no-cache git bash && \
5-
wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.8.1/kind-linux-amd64 && \
5+
wget -O /usr/bin/kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64 && \
66
chmod +x /usr/bin/kind && \
7-
wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl && \
7+
wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.20.2/bin/linux/amd64/kubectl && \
88
chmod +x /usr/bin/kubectl && \
9-
git clone https://github.com/kubernetes-client/gen.git
9+
git clone https://github.com/kubernetes-client/gen.git && \
10+
cd gen && \
11+
git checkout 729332ad08f0f4d98983b7beb027e2f657236ef9
12+
# 729332ad08f0f4d98983b7beb027e2f657236ef9 is the last commit using python2 interpreter
13+
1014

1115
COPY Dockerfile.gen gen/openapi/openapi-generator/Dockerfile
1216
COPY generate.sh generate.sh

client-java-contrib/admissionreview/generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ docker run --rm \
55
-v $LOCAL_MANIFEST_FILE:$LOCAL_MANIFEST_FILE \
66
-v /var/run/docker.sock:/var/run/docker.sock \
77
-v $PWD:$PWD \
8-
-it ghcr.io/yue9944882/crd-model-gen:v1.0.3 \
8+
-it ghcr.io/yue9944882/crd-model-gen:v1.0.6 \
99
sh -c "source /gen/openapi/java-crd-cmd.sh -n v1 -p io.kubernetes.client.admissionreview -l 2 -o $PWD/gen < $LOCAL_MANIFEST_FILE"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under src/main/java/io/cert/manager/models.
1818

1919
DEFAULT_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
20-
DEFAULT_IMAGE_TAG=v1.0.3
20+
DEFAULT_IMAGE_TAG=v1.0.6
2121
IMAGE_NAME=${IMAGE_NAME:=$DEFAULT_IMAGE_NAME}
2222
IMAGE_TAG=${IMAGE_TAG:=$DEFAULT_IMAGE_TAG}
2323

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under src/main/java/io/cert/manager/models.
1818

1919
DEFAULT_IMAGE_NAME=docker.pkg.github.com/kubernetes-client/java/crd-model-gen
20-
DEFAULT_IMAGE_TAG=v1.0.3
20+
DEFAULT_IMAGE_TAG=v1.0.6
2121
IMAGE_NAME=${IMAGE_NAME:=$DEFAULT_IMAGE_NAME}
2222
IMAGE_TAG=${IMAGE_TAG:=$DEFAULT_IMAGE_TAG}
2323

0 commit comments

Comments
 (0)