Skip to content

Commit e919a01

Browse files
committed
Tools Bin
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 <dfranz@redhat.com>
1 parent 4cd2f82 commit e919a01

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-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

.goreleaser.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ before:
99
builds:
1010
- id: operator-controller
1111
main: ./
12+
hooks:
13+
pre:
14+
- mkdir -p bin
1215
binary: bin/manager
1316
tags: $GO_BUILD_TAGS
1417
goos:

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,12 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
174174
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.
175175
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
176176

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

179181
## Location to install dependencies to
180-
LOCALBIN ?= $(shell pwd)/bin
182+
LOCALBIN ?= $(shell pwd)/hack/tools/bin
181183
$(LOCALBIN):
182184
mkdir -p $(LOCALBIN)
183185

bin/.dockerignore

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

hack/tools/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)