Skip to content

Commit a51cd00

Browse files
authored
Merge pull request #1297 from bear-redhat/hotfix/windows-aarch64
🌱 Add Windows ARM64 in Makefile
2 parents bf7d6b7 + e392900 commit a51cd00

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ release-envtest: clean-release ## Build the envtest binaries by operating system
141141
OS=darwin ARCH=amd64 $(MAKE) release-envtest-docker-build
142142
OS=darwin ARCH=arm64 $(MAKE) release-envtest-docker-build
143143
OS=windows ARCH=amd64 $(MAKE) release-envtest-docker-build
144+
OS=windows ARCH=arm64 $(MAKE) release-envtest-docker-build
144145
./hack/envtest/update-releases.sh
145146

146147
.PHONY: release-envtest-docker-build
@@ -168,6 +169,7 @@ release-controller-gen: clean-release ## Build controller-gen binaries.
168169
RELEASE_BINARY=controller-gen-darwin-amd64 GOOS=darwin GOARCH=amd64 $(MAKE) release-binary
169170
RELEASE_BINARY=controller-gen-darwin-arm64 GOOS=darwin GOARCH=arm64 $(MAKE) release-binary
170171
RELEASE_BINARY=controller-gen-windows-amd64.exe GOOS=windows GOARCH=amd64 $(MAKE) release-binary
172+
RELEASE_BINARY=controller-gen-windows-arm64.exe GOOS=windows GOARCH=arm64 $(MAKE) release-binary
171173

172174
.PHONY: release-binary
173175
release-binary: $(RELEASE_DIR)

hack/envtest/windows/Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@ RUN /bin/bash -x -c ' \
4646
cp _output/local/bin/${KUBE_BUILD_PLATFORMS}/kubectl.exe $DEST; }'
4747

4848
# etcd
49-
ENV ETCD_BASE_NAME=etcd-${ETCD_VERSION}-${OS}-${ARCH}
50-
RUN curl -sfLO https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/${ETCD_BASE_NAME}.zip && \
51-
unzip -o ${ETCD_BASE_NAME}.zip && \
52-
cp ${ETCD_BASE_NAME}/etcd.exe $DEST
49+
RUN ETCD_DL_ARCH="$ARCH"; \
50+
if [ "$ARCH" = "arm64" ]; then \
51+
echo "WARNING: etcd for arm64 is not available, downloading amd64 version instead."; \
52+
ETCD_DL_ARCH="amd64"; \
53+
fi; \
54+
ETCD_BASE_NAME="etcd-${ETCD_VERSION}-${OS}-${ETCD_DL_ARCH}"; \
55+
curl -sfLO https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/${ETCD_BASE_NAME}.zip && \
56+
unzip -o ${ETCD_BASE_NAME}.zip && \
57+
cp ${ETCD_BASE_NAME}/etcd.exe $DEST
5358

5459
# Package into tarball.
5560
RUN tar -czvf /envtest-${KUBERNETES_VERSION}-${OS}-${ARCH}.tar.gz $DEST

0 commit comments

Comments
 (0)