Skip to content

Commit

Permalink
Merge pull request #38 from NVIDIA/bump-tool-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
tariq1890 authored Aug 26, 2024
2 parents 69e96de + 182a556 commit 249ba44
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
10 changes: 10 additions & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ linters:
#- wsl

linters-settings:
depguard:
rules:
main:
list-mode: original
allow:
- $gostd
- github.com/NVIDIA
- github.com/go-logr/logr
- k8s.io
- sigs.k8s.io
dupl:
threshold: 100
funlen:
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion api/upgrade/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker/Dockerfile.devel
Original file line number Diff line number Diff line change
Expand Up @@ -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}

0 comments on commit 249ba44

Please sign in to comment.