Skip to content

Commit 6280040

Browse files
committed
kubekins-e2e-v2 multiarch support for s390x
1 parent 3b9e9aa commit 6280040

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

images/kubekins-e2e-v2/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ARG GCLOUD_SDK_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud
6666
RUN wget -O google-cloud-sdk.tar.gz -q $GCLOUD_SDK_URL && \
6767
tar xzf google-cloud-sdk.tar.gz -C / && \
6868
rm google-cloud-sdk.tar.gz && \
69-
if [ "${TARGETARCH}" != "ppc64le" ]; then \
69+
if [ "${TARGETARCH}" != "ppc64le" ] && [ "${TARGETARCH}" != "s390x" ]; then \
7070
/google-cloud-sdk/install.sh \
7171
--disable-installation-options \
7272
--bash-completion=false \
@@ -160,7 +160,7 @@ RUN wget -q "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_
160160

161161
# install kind if a version is provided
162162
ARG KIND_VERSION
163-
RUN if [ "${TARGETARCH}" != "ppc64le" ] && [ -n "${KIND_VERSION}" ]; then \
163+
RUN if [ "${TARGETARCH}" != "ppc64le" ] && [ "${TARGETARCH}" != "s390x" ] && [ -n "${KIND_VERSION}" ]; then \
164164
wget -q -O /usr/local/bin/kind https://kind.sigs.k8s.io/dl/v${KIND_VERSION}/kind-linux-${TARGETARCH} && \
165165
chmod +x /usr/local/bin/kind; \
166166
fi

images/kubekins-e2e-v2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This is a modernised and lean image of the kubekins-e2e image optimised for the core tools required in an e2e image.
44

55
Features:
6-
- multi-arch, supports amd64, arm64 and ppc64le
6+
- multi-arch, supports amd64, arm64 , ppc64le and s390x
77
- kubetest2
88
- kind
99
- aws-cli v1

images/kubekins-e2e-v2/cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
- build
66
- --tag=us-central1-docker.pkg.dev/$PROJECT_ID/images/kubekins-e2e:$_GIT_TAG-$_CONFIG
77
- --build-arg=IMAGE_ARG=us-central1-docker.pkg.dev/$PROJECT_ID/images/kubekins-e2e:$_GIT_TAG-$_CONFIG
8-
- --platform=linux/amd64,linux/arm64,linux/ppc64le
8+
- --platform=linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
99
- --build-arg=CFSSL_VERSION=$_CFSSL_VERSION
1010
- --build-arg=GO_VERSION=$_GO_VERSION
1111
- --build-arg=K8S_RELEASE=$_K8S_RELEASE

0 commit comments

Comments
 (0)