Skip to content

Commit 573884f

Browse files
l1b0kl1b0k
committed
fix lint
Signed-off-by: l1b0k <[email protected]>
1 parent c1db828 commit 573884f

File tree

7 files changed

+29
-28
lines changed

7 files changed

+29
-28
lines changed

Diff for: ‎.github/workflows/build-policy.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
build-policy:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Set up QEMU
22-
uses: docker/setup-qemu-action@v2
22+
uses: docker/setup-qemu-action@v3
2323

2424
- name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v2
25+
uses: docker/setup-buildx-action@v3
2626

2727
- name: Cache Docker layers
2828
uses: actions/cache@v3
@@ -51,7 +51,7 @@ jobs:
5151
if: ${{ github.event_name != 'pull_request' && github.event.action != 'unassigned' }}
5252

5353
- name: Build and push
54-
uses: docker/build-push-action@v3
54+
uses: docker/build-push-action@v6
5555
with:
5656
context: .
5757
file: ./Dockerfile.policy

Diff for: ‎.github/workflows/check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ jobs:
5252
go-version: 1.23.2
5353
cache: false
5454
- name: Run golangci-lint
55-
uses: golangci/golangci-lint-action@v4
55+
uses: golangci/golangci-lint-action@v6
5656
with:
57-
version: v1.55
57+
version: v1.61
5858
args: --config=.golangci.yml
5959

6060
super-linter:

Diff for: ‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040

4141
- name: Initialize CodeQL
4242
uses: github/codeql-action/init@v3

Diff for: ‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
release:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Build Changelog
1818
id: github_release
1919
uses: mikepenz/release-changelog-builder-action@v1

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
113113
## Tool Versions
114114
CONTROLLER_TOOLS_VERSION ?= v0.14.0
115115
ENVTEST_VERSION ?= latest
116-
GOLANGCI_LINT_VERSION ?= v1.55.2
116+
GOLANGCI_LINT_VERSION ?= v1.61.0
117117

118118
.PHONY: controller-gen
119119
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

Diff for: ‎pkg/controller/webhook/mutating.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package webhook
1818

1919
import (
2020
"context"
21+
"errors"
2122
"fmt"
2223
"net/http"
2324
"strconv"
@@ -35,7 +36,7 @@ import (
3536

3637
"gomodules.xyz/jsonpatch/v2"
3738
corev1 "k8s.io/api/core/v1"
38-
"k8s.io/apimachinery/pkg/api/errors"
39+
k8sErr "k8s.io/apimachinery/pkg/api/errors"
3940
"k8s.io/apimachinery/pkg/api/resource"
4041
k8stypes "k8s.io/apimachinery/pkg/types"
4142
"k8s.io/apimachinery/pkg/util/json"
@@ -101,7 +102,7 @@ func podWebhook(ctx context.Context, req *webhook.AdmissionRequest, client clien
101102
if err != nil {
102103
msg := fmt.Sprintf("error get previous podENI conf, %s", err)
103104
l.Error(err, msg)
104-
return webhook.Errored(1, fmt.Errorf(msg))
105+
return webhook.Errored(1, errors.New(msg))
105106
}
106107

107108
// 1. check pod annotation config first
@@ -348,7 +349,7 @@ func getPreviousZone(ctx context.Context, client client.Client, pod *corev1.Pod)
348349
Name: pod.Name,
349350
}, podENI)
350351
if err != nil {
351-
if errors.IsNotFound(err) {
352+
if k8sErr.IsNotFound(err) {
352353
return "", nil
353354
}
354355
return "", err

Diff for: ‎plugin/driver/utils/netlink_linux.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func NetlinkFamily(ip net.IP) int {
3333

3434
func LinkSetName(link netlink.Link, name string) error {
3535
cmd := fmt.Sprintf("ip link set %s name %s", link.Attrs().Name, name)
36-
Log.Infof(cmd)
36+
Log.Info(cmd)
3737
err := netlink.LinkSetName(link, name)
3838
if err != nil {
3939
return fmt.Errorf("error %s, %w", cmd, err)
@@ -43,7 +43,7 @@ func LinkSetName(link netlink.Link, name string) error {
4343

4444
func LinkAdd(link netlink.Link) error {
4545
cmd := fmt.Sprintf("ip link add %s type %s", link.Attrs().Name, link.Type())
46-
Log.Infof(cmd)
46+
Log.Info(cmd)
4747
err := netlink.LinkAdd(link)
4848
if err != nil {
4949
return fmt.Errorf("error %s, %w", cmd, err)
@@ -53,7 +53,7 @@ func LinkAdd(link netlink.Link) error {
5353

5454
func LinkSetUp(link netlink.Link) error {
5555
cmd := fmt.Sprintf("ip link set %s up", link.Attrs().Name)
56-
Log.Infof(cmd)
56+
Log.Info(cmd)
5757
err := netlink.LinkSetUp(link)
5858
if err != nil {
5959
return fmt.Errorf("error %s, %w", cmd, err)
@@ -63,7 +63,7 @@ func LinkSetUp(link netlink.Link) error {
6363

6464
func LinkSetDown(link netlink.Link) error {
6565
cmd := fmt.Sprintf("ip link set %s down", link.Attrs().Name)
66-
Log.Infof(cmd)
66+
Log.Info(cmd)
6767
err := netlink.LinkSetDown(link)
6868
if err != nil {
6969
return fmt.Errorf("error %s, %w", cmd, err)
@@ -73,7 +73,7 @@ func LinkSetDown(link netlink.Link) error {
7373

7474
func LinkDel(link netlink.Link) error {
7575
cmd := fmt.Sprintf("ip link del %s", link.Attrs().Name)
76-
Log.Infof(cmd)
76+
Log.Info(cmd)
7777
err := netlink.LinkDel(link)
7878
if err != nil {
7979
if _, ok := err.(netlink.LinkNotFoundError); ok {
@@ -86,7 +86,7 @@ func LinkDel(link netlink.Link) error {
8686

8787
func LinkSetMTU(link netlink.Link, mtu int) error {
8888
cmd := fmt.Sprintf("ip link set %s mtu %d", link.Attrs().Name, mtu)
89-
Log.Infof(cmd)
89+
Log.Info(cmd)
9090
err := netlink.LinkSetMTU(link, mtu)
9191
if err != nil {
9292
return fmt.Errorf("error %s, %w", cmd, err)
@@ -96,7 +96,7 @@ func LinkSetMTU(link netlink.Link, mtu int) error {
9696

9797
func AddrDel(link netlink.Link, addr *netlink.Addr) error {
9898
cmd := fmt.Sprintf("ip addr del %s dev %s", addr.IPNet.String(), link.Attrs().Name)
99-
Log.Infof(cmd)
99+
Log.Info(cmd)
100100
err := netlink.AddrDel(link, addr)
101101
if err != nil {
102102
return fmt.Errorf("error %s, %w", cmd, err)
@@ -106,7 +106,7 @@ func AddrDel(link netlink.Link, addr *netlink.Addr) error {
106106

107107
func AddrReplace(link netlink.Link, addr *netlink.Addr) error {
108108
cmd := fmt.Sprintf("ip addr replace %s dev %s", addr.IPNet.String(), link.Attrs().Name)
109-
Log.Infof(cmd)
109+
Log.Info(cmd)
110110
err := netlink.AddrReplace(link, addr)
111111
if err != nil {
112112
return fmt.Errorf("error %s, %w", cmd, err)
@@ -116,7 +116,7 @@ func AddrReplace(link netlink.Link, addr *netlink.Addr) error {
116116

117117
func RouteReplace(route *netlink.Route) error {
118118
cmd := fmt.Sprintf("ip route replace %s", route.String())
119-
Log.Infof(cmd)
119+
Log.Info(cmd)
120120
err := netlink.RouteReplace(route)
121121
if err != nil {
122122
return fmt.Errorf("error %s, %w", cmd, err)
@@ -126,7 +126,7 @@ func RouteReplace(route *netlink.Route) error {
126126

127127
func RouteDel(route *netlink.Route) error {
128128
cmd := fmt.Sprintf("ip route del %s", route.String())
129-
Log.Infof(cmd)
129+
Log.Info(cmd)
130130
err := netlink.RouteDel(route)
131131
if err != nil {
132132
return fmt.Errorf("error %s, %w", cmd, err)
@@ -136,7 +136,7 @@ func RouteDel(route *netlink.Route) error {
136136

137137
func NeighSet(neigh *netlink.Neigh) error {
138138
cmd := fmt.Sprintf("ip neigh replace %s", neigh.String())
139-
Log.Infof(cmd)
139+
Log.Info(cmd)
140140
err := netlink.NeighSet(neigh)
141141
if err != nil {
142142
return fmt.Errorf("error %s, %w", cmd, err)
@@ -146,7 +146,7 @@ func NeighSet(neigh *netlink.Neigh) error {
146146

147147
func RuleAdd(rule *netlink.Rule) error {
148148
cmd := fmt.Sprintf("ip rule add %s", rule.String())
149-
Log.Infof(cmd)
149+
Log.Info(cmd)
150150
err := netlink.RuleAdd(rule)
151151
if err != nil {
152152
return fmt.Errorf("error %s, %w", cmd, err)
@@ -156,7 +156,7 @@ func RuleAdd(rule *netlink.Rule) error {
156156

157157
func RuleDel(rule *netlink.Rule) error {
158158
cmd := fmt.Sprintf("ip rule del %s", rule.String())
159-
Log.Infof(cmd)
159+
Log.Info(cmd)
160160
err := netlink.RuleDel(rule)
161161
if err != nil {
162162
rule.IifName = ""
@@ -172,7 +172,7 @@ func RuleDel(rule *netlink.Rule) error {
172172

173173
func LinkSetNsFd(link netlink.Link, netNS ns.NetNS) error {
174174
cmd := fmt.Sprintf("ip link set %s netns %s", link.Attrs().Name, netNS.Path())
175-
Log.Infof(cmd)
175+
Log.Info(cmd)
176176
err := netlink.LinkSetNsFd(link, int(netNS.Fd()))
177177
if err != nil {
178178
return fmt.Errorf("error %s, %w", cmd, err)
@@ -182,7 +182,7 @@ func LinkSetNsFd(link netlink.Link, netNS ns.NetNS) error {
182182

183183
func QdiscReplace(qdisc netlink.Qdisc) error {
184184
cmd := fmt.Sprintf("tc qdisc replace %s", qdisc.Attrs().String())
185-
Log.Infof(cmd)
185+
Log.Info(cmd)
186186
err := netlink.QdiscReplace(qdisc)
187187
if err != nil {
188188
return fmt.Errorf("error %s, %w", cmd, err)
@@ -191,7 +191,7 @@ func QdiscReplace(qdisc netlink.Qdisc) error {
191191
}
192192
func QdiscDel(qdisc netlink.Qdisc) error {
193193
cmd := fmt.Sprintf("tc qdisc del %s", qdisc.Attrs().String())
194-
Log.Infof(cmd)
194+
Log.Info(cmd)
195195
err := netlink.QdiscDel(qdisc)
196196
if err != nil {
197197
return fmt.Errorf("error %s, %w", cmd, err)

0 commit comments

Comments
 (0)