scripts: fix make generate and seperate tooling

Signed-off-by: Damien Grisonnet <[email protected]>

Author: dgrisonnet

.gitignore

@@ -1,3 +1,4 @@
 _output/
 manifest-tool
-.idea/*
+.idea/*
+tmp

Makefile

@@ -20,6 +20,11 @@ ALL_BINARIES ?= $(addprefix $(OUT_DIR)/$(BIN)-, \
 				darwin-amd64 \
 				windows-amd64.exe)
 
+TOOLS_BIN_DIR?=$(shell pwd)/tmp/bin
+export PATH := $(TOOLS_BIN_DIR):$(PATH)
+
+EMBEDMD_BINARY=$(TOOLS_BIN_DIR)/embedmd
+TOOLING=$(EMBEDMD_BINARY)
 
 check-license:
 	@echo ">> checking license headers"
@@ -82,14 +87,18 @@ test:
 test-e2e:
 	go test -timeout 55m -v ./test/e2e/ $(TEST_RUN_ARGS) --kubeconfig=$(KUBECONFIG)
 
-generate: build embedmd
+generate: build $(EMBEDMD_BINARY)
 	@echo ">> generating examples"
 	@./scripts/generate-examples.sh
 	@echo ">> generating docs"
 	@./scripts/generate-help-txt.sh
-	@$(GOPATH)/bin/embedmd -w `find ./ -prune -o -name "*.md" -print`
+	@$(EMBEDMD_BINARY) -w `find ./ -name "*.md" -print`
+
+$(TOOLS_BIN_DIR):
+	@mkdir -p $(TOOLS_BIN_DIR)
 
-embedmd:
-	@go get github.com/campoy/embedmd
+$(TOOLING): $(TOOLS_BIN_DIR)
+	@echo Installing tools from scripts/tools.go
+	@cat scripts/tools.go | grep _ | awk -F'"' '{print $$2}' | GOBIN=$(TOOLS_BIN_DIR) xargs -tI % go install -mod=readonly -modfile=scripts/go.mod %
 
-.PHONY: all check-license crossbuild build container push push-% manifest-push curl-container test generate embedmd
+.PHONY: all check-license crossbuild build container push push-% manifest-push curl-container test generate

scripts/generate-help-txt.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 echo "$ kube-rbac-proxy -h" > _output/help.txt
-_output/linux/amd64/kube-rbac-proxy -h 2>> _output/help.txt
+_output/kube-rbac-proxy -h 2>> _output/help.txt
 exit 0

scripts/go.mod

@@ -0,0 +1,5 @@
+module github.com/brancz/kube-rbac-proxy/tooling
+
+go 1.14
+
+require github.com/campoy/embedmd v1.0.0

scripts/go.sum

@@ -0,0 +1,4 @@
+github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY=
+github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

scripts/tools.go

@@ -0,0 +1,23 @@
+/*
+Copyright 2020 Frederic Branczyk All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+//+build tools
+
+package tools
+
+import (
+	_ "github.com/campoy/embedmd"
+)