From c0e6b668b41a17f51f0105b40458e8d59562a6d0 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 20 Sep 2018 16:48:31 +0300 Subject: [PATCH] Fix the run goal Instead of relying on the binary being present, we just use go run. We also set all the necessary compilation flags, environment variables and trap the interrupt signal in order to avoid having Make fail when the execution of the goal is interrupted Signed-off-by: Georgios Andrianakis --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a9d7aba8c..71e60dc6b 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ e2e-tests: es crd build docker push @go test ./test/e2e/... -kubeconfig $(KUBERNETES_CONFIG) -namespacedMan ../../deploy/test/namespace-manifests.yaml -globalMan ../../deploy/crd.yaml -root . run: crd - @OPERATOR_NAME=$(OPERATOR_NAME) KUBERNETES_CONFIG=$(KUBERNETES_CONFIG) WATCH_NAMESPACE=$(WATCH_NAMESPACE) ./_output/bin/jaeger-operator start + @bash -c 'trap "exit 0" INT; OPERATOR_NAME=${OPERATOR_NAME} KUBERNETES_CONFIG=${KUBERNETES_CONFIG} WATCH_NAMESPACE=${WATCH_NAMESPACE} go run -ldflags ${LD_FLAGS} main.go start' es: @kubectl create -f ./test/elasticsearch.yml 2>&1 | grep -v "already exists" || true