[solr-operator] branch main updated: Improve build-dependency installation (#430)

[houston]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new ff4452f  Improve build-dependency installation (#430)
ff4452f is described below

commit ff4452f71d227979502f6485e5cd15b9f3d82a02
Author: Houston Putman <hous...@apache.org>
AuthorDate: Wed Apr 6 15:51:43 2022 -0400

    Improve build-dependency installation (#430)
    
    - Set explicit version for go-licenses
    - Install kustomize via "go install"
---
 Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 856250a..178631f 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,9 @@ GIT_SHA = $(shell git rev-parse --short HEAD)
 GOOS = $(shell go env GOOS)
 ARCH = $(shell go env GOARCH)
 
-KUSTOMIZE_VERSION=4.3.0
+KUSTOMIZE_VERSION=v4.5.2
 CONTROLLER_GEN_VERSION=v0.5.0
+GO_LICENSES_VERSION=v1.0.0
 
 GO111MODULE ?= on
 
@@ -240,18 +241,12 @@ controller-gen: ## Download controller-gen locally if 
necessary.
        $(call 
go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION))
 
 KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
-# Uncomment and remove other lines once kustomize supports "go install"
-# https://github.com/kubernetes-sigs/kustomize/issues/3618
-# $(call 
go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v$(KUSTOMIZE_VERSION))
 kustomize: ## Download kustomize locally if necessary.
-ifeq (,$(wildcard $(KUSTOMIZE)))
-       @echo "Downloading kustomize"
-       (cd /tmp && curl -s 
"https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh";
 | bash -s -- $(KUSTOMIZE_VERSION) $(PROJECT_DIR)/bin)
-endif
+       $(call 
go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@$(KUSTOMIZE_VERSION))
 
 GO_LICENSES = $(PROJECT_DIR)/bin/go-licenses
 go-licenses: ## Download go-licenses locally if necessary.
-       $(call go-get-tool,$(GO_LICENSES),github.com/google/go-licenses@latest)
+       $(call 
go-get-tool,$(GO_LICENSES),github.com/google/go-licenses@$(GO_LICENSES_VERSION))
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))