Skip to content

Commit 06adc7e

Browse files
Merge pull request #61 from Mellanox/main
chore: sync release branch from master
2 parents b00cfe8 + 3003571 commit 06adc7e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/codeql.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
- name: Checkout
2323
uses: actions/checkout@v5
2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v3
25+
uses: github/codeql-action/init@v4
2626
with:
2727
languages: ${{ matrix.language }}
2828
queries: +security-and-quality
2929
- name: Autobuild
30-
uses: github/codeql-action/autobuild@v3
30+
uses: github/codeql-action/autobuild@v4
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@v3
32+
uses: github/codeql-action/analyze@v4
3333
with:
3434
category: "/language:${{ matrix.language }}"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY . /workspace
3434
# Build with make to apply all build logic defined in Makefile
3535
RUN make build
3636

37-
FROM nvcr.io/nvidia/distroless/go:v3.1.13
37+
FROM nvcr.io/nvidia/distroless/go:v3.2.0
3838
WORKDIR /
3939
COPY --from=builder /workspace/build/network-operator-init-container .
4040

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ DOCKER_CMD ?= docker
2424
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
2525
ENVTEST_K8S_VERSION = 1.31.0
2626

27+
SETUP_ENVTEST_VERSION ?= release-0.21
28+
2729
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
2830
ifeq (,$(shell go env GOBIN))
2931
GOBIN=$(shell go env GOPATH)/bin
@@ -114,7 +116,7 @@ GOLANGCILINT_VERSION ?= v1.64.8
114116
.PHONY: envtest
115117
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
116118
$(ENVTEST): | $(LOCALBIN)
117-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
119+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(SETUP_ENVTEST_VERSION)
118120

119121
.PHONY: golangci-lint
120122
golangci-lint: $(GOLANGCILINT) ## Download golangci-lint locally if necessary.

0 commit comments

Comments
 (0)