Skip to content

Commit cc4b09a

Browse files
authored
Tools Bin (#181)
Separates the tools binaries out to their own folder so we can stop doing funky stuff to ignore them when building the operator-controller image. Signed-off-by: dtfranz <[email protected]>
1 parent cece9b2 commit cc4b09a

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vendor
88
*.dylib
99
bin/*
1010
testbin/*
11+
/hack/tools/bin/*
1112
Dockerfile.cross
1213

1314
# Test binary, build with `go test -c`
@@ -33,5 +34,3 @@ install.sh
3334
\#*\#
3435
.\#*
3536

36-
# TODO dfranz remove this line and the bin folder when tools binaries are moved to their own folder
37-
!bin/.dockerignore

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ kind-cluster-cleanup: kind ## Delete the kind cluster
9898

9999
.PHONY: build
100100
build: manifests generate fmt vet goreleaser ## Build manager binary using goreleaser for current GOOS and GOARCH.
101+
mkdir -p bin
101102
${GORELEASER} build ${GORELEASER_ARGS} --single-target -o bin/manager
102103

103104
.PHONY: run
@@ -174,10 +175,12 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
174175
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
175176
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
176177

177-
##@ Build Dependencies
178+
################
179+
# Hack / Tools #
180+
################
178181

179182
## Location to install dependencies to
180-
LOCALBIN ?= $(shell pwd)/bin
183+
LOCALBIN ?= $(shell pwd)/hack/tools/bin
181184
$(LOCALBIN):
182185
mkdir -p $(LOCALBIN)
183186

bin/.dockerignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

hack/tools/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)