Skip to content

Commit 85ea423

Browse files
committed
fix errors
1 parent acddfe1 commit 85ea423

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

.github/workflows/crdgen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0
1818
- uses: actions/setup-go@v5
1919
with:
20-
go-version: stable
20+
go-version-file: go.mod
2121
- name: Regenerate NodeNetworkConfig CRD
2222
run: make -C crd/nodenetworkconfig
2323
- name: Regenerate MultitenantNetworkContainer CRD

.github/workflows/cyclonus-netpol-extended-nightly-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- uses: actions/setup-go@v5
2929
with:
30-
go-version: stable
30+
go-version-file: go.mod
3131

3232
- name: Setup Kind
3333
uses: engineerd/[email protected]

.github/workflows/cyclonus-netpol-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: actions/setup-go@v5
3636
with:
37-
go-version: stable
37+
go-version-file: go.mod
3838

3939
- name: Setup Kind
4040
uses: helm/kind-action@v1

.github/workflows/golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: stable
24+
go-version-file: go.mod
2525
- uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 0

.pipelines/pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ stages:
6767
{ { { {
6868
sudo -E env "PATH=$PATH" make test-all;
6969
echo $? >&3;
70-
} | tee >(go tool go-junit-report > report.xml) >&4;
70+
} | tee >(go tool github.com/jstemmer/go-junit-report > report.xml) >&4;
7171
} 3>&1;
7272
} | { read xs; exit $xs; }
7373
} 4>&1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ clean: ## Clean build artifacts.
674674

675675
LINT_PKG ?= .
676676

677-
GOLANGCI_LINT = go tool golangci-lint
677+
GOLANGCI_LINT = go tool github.com/golangci/golangci-lint/cmd/golangci-lint
678678

679679
lint: ## Fast lint vs default branch showing only new issues.
680680
GOGC=20 $(GOLANGCI_LINT) run --new-from-rev release/v1.4 --config=.golangci.yml --timeout 10m -v $(LINT_PKG)/...

cns/multitenantcontroller/mockclients/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REPO_ROOT = $(shell git rev-parse --show-toplevel)
2-
MOCKGEN = go tool mockgen
2+
MOCKGEN = go tool github.com/golang/mock/mockgen
33

44
generate: $(MOCKGEN) ## Generate mock clients
55
@go mod vendor

crd/clustersubnetstate/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.DEFAULT_GOAL = all
22

33
REPO_ROOT = $(shell git rev-parse --show-toplevel)
4-
CONTROLLER_GEN = go tool controller-gen
4+
CONTROLLER_GEN = go tool sigs.k8s.io/controller-tools/cmd/controller-gen
55

66
all: generate manifests
77

crd/multitenantnetworkcontainer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.DEFAULT_GOAL: all
22

33
REPO_ROOT = $(shell git rev-parse --show-toplevel)
4-
CONTROLLER_GEN = go tool controller-gen
4+
CONTROLLER_GEN = go tool sigs.k8s.io/controller-tools/cmd/controller-gen
55

66
all: generate manifests
77

crd/nodenetworkconfig/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.DEFAULT_GOAL = all
22

33
REPO_ROOT = $(shell git rev-parse --show-toplevel)
4-
CONTROLLER_GEN = go tool controller-gen
4+
CONTROLLER_GEN = go tool sigs.k8s.io/controller-tools/cmd/controller-gen
55

66
all: generate manifests
77

0 commit comments

Comments
 (0)