diff --git a/Makefile b/Makefile index 456fdc76..cd301bbf 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ MODULE := github.com/NVIDIA/k8s-operator-libs DOCKER ?= docker -GOLANG_VERSION := 1.21 +GOLANG_VERSION := 1.23 ifeq ($(IMAGE),) REGISTRY ?= nvidia @@ -41,9 +41,9 @@ TOOLSDIR=$(CURDIR)/bin GOLANGCILINT ?= $(TOOLSDIR)/golangci-lint CONTROLLER_GEN ?= $(TOOLSDIR)/controller-gen GCOV2LCOV ?= $(TOOLSDIR)/gcov2lcov -GOLANGCILINT_VERSION ?= v1.52.2 -CONTROLLER_GEN_VERSION ?= v0.10.0 -GCOV2LCOV_VERSION ?= v1.0.5 +GOLANGCILINT_VERSION ?= v1.60.3 +CONTROLLER_GEN_VERSION ?= v0.16.1 +GCOV2LCOV_VERSION ?= v1.0.6 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -69,7 +69,7 @@ go-check: ## Run go checks to ensure modules are synced go mod tidy && git diff --exit-code generate: controller-gen ## Generate code - $(CONTROLLER_GEN) object object:headerFile="hack/boilerplate.go.txt" paths="./api/..." + $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..." go generate $(MODULE)/... test: generate; $(info running $(NAME:%=% )tests...) @ ## Run tests diff --git a/api/upgrade/v1alpha1/zz_generated.deepcopy.go b/api/upgrade/v1alpha1/zz_generated.deepcopy.go index 38f524f7..9c2adde6 100644 --- a/api/upgrade/v1alpha1/zz_generated.deepcopy.go +++ b/api/upgrade/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022 NVIDIA diff --git a/docker/Dockerfile.devel b/docker/Dockerfile.devel index 00e2a406..05ecebba 100644 --- a/docker/Dockerfile.devel +++ b/docker/Dockerfile.devel @@ -11,5 +11,5 @@ # 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. -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.23 FROM golang:${GOLANG_VERSION}