From 2aa8ffa4ede4a824a8b32d6f0aee45c93a09b7a0 Mon Sep 17 00:00:00 2001 From: Andy Sadler Date: Tue, 14 Feb 2023 06:53:45 -0600 Subject: [PATCH] bump dependencies (#29) Signed-off-by: Andy Sadler --- hack/check-conflicts.sh | 4 ++-- make/deps.mk | 4 ++-- make/linters.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/check-conflicts.sh b/hack/check-conflicts.sh index 35cf7329..42bc6986 100755 --- a/hack/check-conflicts.sh +++ b/hack/check-conflicts.sh @@ -26,9 +26,9 @@ while IFS='' read -r file; do check_file "$file" || ((overall_failed++)) done < <(git ls-tree --full-tree -r HEAD --name-only | grep -v "vendor/" ) -if [ $overall_failed -eq 0 ]; then +if [ "${overall_failed}" -eq 0 ]; then echo -e "\nNone of the tracked or staged files contain strings indicating a git conflict... PASS\n" else echo -e "\nThe above listed files contains strings indicating a git conflict... FAIL\n" fi -exit $overall_failed +exit "${overall_failed}" diff --git a/make/deps.mk b/make/deps.mk index 40bba48d..2f6ee938 100644 --- a/make/deps.mk +++ b/make/deps.mk @@ -11,8 +11,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions -KUSTOMIZE_VERSION ?= v4.5.7 -CONTROLLER_TOOLS_VERSION ?= v0.10.0 +KUSTOMIZE_VERSION ?= v5.0.0 +CONTROLLER_TOOLS_VERSION ?= v0.11.3 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/make/linters.mk b/make/linters.mk index aa0a994f..9887603d 100644 --- a/make/linters.mk +++ b/make/linters.mk @@ -1,7 +1,7 @@ ##@ Linters GOLANGCI_LINT=$(LOCALBIN)/golangci-lint -GOLANGCI_LINT_VERSION ?= v1.50.1 +GOLANGCI_LINT_VERSION ?= v1.51.1 YAMLLINT_VERSION ?= 1.28.0