Skip to content

Commit b7829fa

Browse files
committed
fix: define default RUNNER_IMAGE tag, add namespace to sample GarmServerConfig CR
1 parent d5dfdaa commit b7829fa

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ test:
7979

8080
copy:
8181
@echo "copying binaries..."
82-
@mkdir -p ./hack/bin
82+
@mkdir -p ./hack/bine
8383
@cp "$(BIN_DIR)/$(BINARY_NAME)" "./hack/bin/$(BINARY_NAME)"
8484

8585
clean:
@@ -96,11 +96,13 @@ docker-build: ## Build a garm image with the k8s provider
9696

9797
.PHONY: docker-build-summerwind-runner
9898
docker-build-summerwind-runner: ## Build the used runner image
99+
$(eval RUNNER_IMAGE ?= $(shell echo "localhost:5000/runner:linux-ubuntu-22.04-$(shell uname -m)"))
99100
docker build -t $(RUNNER_IMAGE) ./runner/summerwind
100101
docker push $(RUNNER_IMAGE)
101102

102103
.PHONY: docker-build-upstream-runner
103104
docker-build-upstream-runner: ## Build the used runner image
105+
$(eval RUNNER_IMAGE ?= $(shell echo "localhost:5000/runner:upstream-linux-ubuntu-22.04-$(shell uname -m)"))
104106
docker build -t $(RUNNER_IMAGE) ./runner/upstream
105107
docker push $(RUNNER_IMAGE)
106108

hack/local-development/kubernetes/garm-operator-crs-envsubst.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: garm-operator.mercedes-benz.com/v1beta1
22
kind: GarmServerConfig
33
metadata:
44
name: garm-server-config
5+
namespace: garm-operator-system
56
spec:
67
callbackUrl: http://garm-server.garm-server.svc:9997/api/v1/callbacks
78
metadataUrl: http://garm-server.garm-server.svc:9997/api/v1/metadata

0 commit comments

Comments
 (0)