Skip to content

Tools Bin #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2023
Merged

Tools Bin #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vendor
*.dylib
bin/*
testbin/*
/hack/tools/bin/*
Dockerfile.cross

# Test binary, build with `go test -c`
Expand All @@ -33,5 +34,3 @@ install.sh
\#*\#
.\#*

# TODO dfranz remove this line and the bin folder when tools binaries are moved to their own folder
!bin/.dockerignore
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ kind-cluster-cleanup: kind ## Delete the kind cluster

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

.PHONY: run
Expand Down Expand Up @@ -174,10 +175,12 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
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.
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -

##@ Build Dependencies
################
# Hack / Tools #
################

## Location to install dependencies to
LOCALBIN ?= $(shell pwd)/bin
LOCALBIN ?= $(shell pwd)/hack/tools/bin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if this is a bit too long; in k8s repos, the scripts are located directly in the hack directory, and then we add the tools and bin directory, all of which end up as synonyms of each other? Perhaps something shorter?
(Not a fan of the name of the directory, but it's what k8s does... shrug)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's setup this way to give us an option in the future of declaring our go tools via go.mod file in hack/tools/, then when those are pulled down they'll go in hack/tools/bin/. Makes it a bit easier to manage with our .gitignore files IMO.

$(LOCALBIN):
mkdir -p $(LOCALBIN)

Expand Down
8 changes: 0 additions & 8 deletions bin/.dockerignore
View file
Open in desktop

This file was deleted.

Empty file added hack/tools/.gitkeep
View file
Open in desktop
Empty file.