Skip to content

Commit ffed1ed

Browse files
committed
fixup! fix: make targets run on arm64 architecture
Signed-off-by: Oleksii Kurinnyi <[email protected]>
1 parent 314d851 commit ffed1ed

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ docker-build:
199199
$(DOCKER) cp temp-builder:/devworkspace-operator/_output/bin ./_output; \
200200
# remove the temporary container
201201
$(DOCKER) rm temp-builder; \
202-
$(DOCKER) build . --platform linux/amd64 -t ${DWO_IMG} -f build/Dockerfile.arm; \
202+
$(DOCKER) build . --platform linux/amd64 -t ${DWO_IMG} -f build/Dockerfile.arm64; \
203203
# remove the temporary directory
204204
#rm -rf ./_output; \
205205
else \
@@ -218,7 +218,7 @@ docker-push:
218218
### compile-devworkspace-controller: Compiles the devworkspace-controller binary
219219
.PHONY: compile-devworkspace-controller
220220
compile-devworkspace-controller:
221-
CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) GO111MODULE=on go build \
221+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build \
222222
-a -o _output/bin/devworkspace-controller \
223223
-gcflags all=-trimpath=/ \
224224
-asmflags all=-trimpath=/ \
@@ -229,7 +229,7 @@ compile-devworkspace-controller:
229229
### compile-webhook-server: Compiles the webhook-server
230230
.PHONY: compile-webhook-server
231231
compile-webhook-server:
232-
CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) GO111MODULE=on go build \
232+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build \
233233
-o _output/bin/webhook-server \
234234
-gcflags all=-trimpath=/ \
235235
-asmflags all=-trimpath=/ \

build/make/deploy.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ _gen_configuration_env:
5858
cat $(CONTROLLER_ENV_FILE)
5959

6060
_store_tls_cert:
61-
mkdir -p /tmp/k8s-webhook-server/serving-certs/
61+
mkdir -p $(TMPDIR)/k8s-webhook-server/serving-certs/
6262
ifeq ($(PLATFORM),kubernetes)
63-
$(K8S_CLI) get secret devworkspace-operator-webhook-cert -n $(NAMESPACE) -o json | jq -r '.data["tls.crt"]' | base64 -d > /tmp/k8s-webhook-server/serving-certs/tls.crt
64-
$(K8S_CLI) get secret devworkspace-operator-webhook-cert -n $(NAMESPACE) -o json | jq -r '.data["tls.key"]' | base64 -d > /tmp/k8s-webhook-server/serving-certs/tls.key
63+
$(K8S_CLI) get secret devworkspace-operator-webhook-cert -n $(NAMESPACE) -o json | jq -r '.data["tls.crt"]' | base64 -d > $(TMPDIR)/k8s-webhook-server/serving-certs/tls.crt
64+
$(K8S_CLI) get secret devworkspace-operator-webhook-cert -n $(NAMESPACE) -o json | jq -r '.data["tls.key"]' | base64 -d > $(TMPDIR)/k8s-webhook-server/serving-certs/tls.key
6565
else
66-
$(K8S_CLI) get secret devworkspace-webhookserver-tls -n $(NAMESPACE) -o json | jq -r '.data["tls.crt"]' | base64 -d > /tmp/k8s-webhook-server/serving-certs/tls.crt
67-
$(K8S_CLI) get secret devworkspace-webhookserver-tls -n $(NAMESPACE) -o json | jq -r '.data["tls.key"]' | base64 -d > /tmp/k8s-webhook-server/serving-certs/tls.key
66+
$(K8S_CLI) get secret devworkspace-webhookserver-tls -n $(NAMESPACE) -o json | jq -r '.data["tls.crt"]' | base64 -d > $(TMPDIR)/k8s-webhook-server/serving-certs/tls.crt
67+
$(K8S_CLI) get secret devworkspace-webhookserver-tls -n $(NAMESPACE) -o json | jq -r '.data["tls.key"]' | base64 -d > $(TMPDIR)/k8s-webhook-server/serving-certs/tls.key
6868
endif
6969

7070
_check_controller_running:

0 commit comments

Comments
 (0)