From 573884f3298994454bc28a0ac27fc60fbcef52e1 Mon Sep 17 00:00:00 2001 From: l1b0k Date: Tue, 15 Oct 2024 19:13:28 +0800 Subject: [PATCH] fix lint Signed-off-by: l1b0k --- .github/workflows/build-policy.yml | 8 +++---- .github/workflows/check.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/release.yml | 2 +- Makefile | 2 +- pkg/controller/webhook/mutating.go | 7 +++--- plugin/driver/utils/netlink_linux.go | 32 +++++++++++++-------------- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build-policy.yml b/.github/workflows/build-policy.yml index 38b7e3b8..b87ed5b1 100644 --- a/.github/workflows/build-policy.yml +++ b/.github/workflows/build-policy.yml @@ -17,12 +17,12 @@ jobs: build-policy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Cache Docker layers uses: actions/cache@v3 @@ -51,7 +51,7 @@ jobs: if: ${{ github.event_name != 'pull_request' && github.event.action != 'unassigned' }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile.policy diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 5f956e01..8bb5f2bc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -52,9 +52,9 @@ jobs: go-version: 1.23.2 cache: false - name: Run golangci-lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v6 with: - version: v1.55 + version: v1.61 args: --config=.golangci.yml super-linter: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fda94871..6029095b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4ff77c3..af99c2ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build Changelog id: github_release uses: mikepenz/release-changelog-builder-action@v1 diff --git a/Makefile b/Makefile index a19a8d66..1d3e8954 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION) ## Tool Versions CONTROLLER_TOOLS_VERSION ?= v0.14.0 ENVTEST_VERSION ?= latest -GOLANGCI_LINT_VERSION ?= v1.55.2 +GOLANGCI_LINT_VERSION ?= v1.61.0 .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. diff --git a/pkg/controller/webhook/mutating.go b/pkg/controller/webhook/mutating.go index 15c3e576..55993ebc 100644 --- a/pkg/controller/webhook/mutating.go +++ b/pkg/controller/webhook/mutating.go @@ -18,6 +18,7 @@ package webhook import ( "context" + "errors" "fmt" "net/http" "strconv" @@ -35,7 +36,7 @@ import ( "gomodules.xyz/jsonpatch/v2" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" + k8sErr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" k8stypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/json" @@ -101,7 +102,7 @@ func podWebhook(ctx context.Context, req *webhook.AdmissionRequest, client clien if err != nil { msg := fmt.Sprintf("error get previous podENI conf, %s", err) l.Error(err, msg) - return webhook.Errored(1, fmt.Errorf(msg)) + return webhook.Errored(1, errors.New(msg)) } // 1. check pod annotation config first @@ -348,7 +349,7 @@ func getPreviousZone(ctx context.Context, client client.Client, pod *corev1.Pod) Name: pod.Name, }, podENI) if err != nil { - if errors.IsNotFound(err) { + if k8sErr.IsNotFound(err) { return "", nil } return "", err diff --git a/plugin/driver/utils/netlink_linux.go b/plugin/driver/utils/netlink_linux.go index 9bf26e70..fca99e66 100644 --- a/plugin/driver/utils/netlink_linux.go +++ b/plugin/driver/utils/netlink_linux.go @@ -33,7 +33,7 @@ func NetlinkFamily(ip net.IP) int { func LinkSetName(link netlink.Link, name string) error { cmd := fmt.Sprintf("ip link set %s name %s", link.Attrs().Name, name) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.LinkSetName(link, name) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -43,7 +43,7 @@ func LinkSetName(link netlink.Link, name string) error { func LinkAdd(link netlink.Link) error { cmd := fmt.Sprintf("ip link add %s type %s", link.Attrs().Name, link.Type()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.LinkAdd(link) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -53,7 +53,7 @@ func LinkAdd(link netlink.Link) error { func LinkSetUp(link netlink.Link) error { cmd := fmt.Sprintf("ip link set %s up", link.Attrs().Name) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.LinkSetUp(link) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -63,7 +63,7 @@ func LinkSetUp(link netlink.Link) error { func LinkSetDown(link netlink.Link) error { cmd := fmt.Sprintf("ip link set %s down", link.Attrs().Name) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.LinkSetDown(link) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -73,7 +73,7 @@ func LinkSetDown(link netlink.Link) error { func LinkDel(link netlink.Link) error { cmd := fmt.Sprintf("ip link del %s", link.Attrs().Name) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.LinkDel(link) if err != nil { if _, ok := err.(netlink.LinkNotFoundError); ok { @@ -86,7 +86,7 @@ func LinkDel(link netlink.Link) error { func LinkSetMTU(link netlink.Link, mtu int) error { cmd := fmt.Sprintf("ip link set %s mtu %d", link.Attrs().Name, mtu) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.LinkSetMTU(link, mtu) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -96,7 +96,7 @@ func LinkSetMTU(link netlink.Link, mtu int) error { func AddrDel(link netlink.Link, addr *netlink.Addr) error { cmd := fmt.Sprintf("ip addr del %s dev %s", addr.IPNet.String(), link.Attrs().Name) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.AddrDel(link, addr) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -106,7 +106,7 @@ func AddrDel(link netlink.Link, addr *netlink.Addr) error { func AddrReplace(link netlink.Link, addr *netlink.Addr) error { cmd := fmt.Sprintf("ip addr replace %s dev %s", addr.IPNet.String(), link.Attrs().Name) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.AddrReplace(link, addr) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -116,7 +116,7 @@ func AddrReplace(link netlink.Link, addr *netlink.Addr) error { func RouteReplace(route *netlink.Route) error { cmd := fmt.Sprintf("ip route replace %s", route.String()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.RouteReplace(route) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -126,7 +126,7 @@ func RouteReplace(route *netlink.Route) error { func RouteDel(route *netlink.Route) error { cmd := fmt.Sprintf("ip route del %s", route.String()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.RouteDel(route) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -136,7 +136,7 @@ func RouteDel(route *netlink.Route) error { func NeighSet(neigh *netlink.Neigh) error { cmd := fmt.Sprintf("ip neigh replace %s", neigh.String()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.NeighSet(neigh) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -146,7 +146,7 @@ func NeighSet(neigh *netlink.Neigh) error { func RuleAdd(rule *netlink.Rule) error { cmd := fmt.Sprintf("ip rule add %s", rule.String()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.RuleAdd(rule) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -156,7 +156,7 @@ func RuleAdd(rule *netlink.Rule) error { func RuleDel(rule *netlink.Rule) error { cmd := fmt.Sprintf("ip rule del %s", rule.String()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.RuleDel(rule) if err != nil { rule.IifName = "" @@ -172,7 +172,7 @@ func RuleDel(rule *netlink.Rule) error { func LinkSetNsFd(link netlink.Link, netNS ns.NetNS) error { cmd := fmt.Sprintf("ip link set %s netns %s", link.Attrs().Name, netNS.Path()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.LinkSetNsFd(link, int(netNS.Fd())) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -182,7 +182,7 @@ func LinkSetNsFd(link netlink.Link, netNS ns.NetNS) error { func QdiscReplace(qdisc netlink.Qdisc) error { cmd := fmt.Sprintf("tc qdisc replace %s", qdisc.Attrs().String()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.QdiscReplace(qdisc) if err != nil { return fmt.Errorf("error %s, %w", cmd, err) @@ -191,7 +191,7 @@ func QdiscReplace(qdisc netlink.Qdisc) error { } func QdiscDel(qdisc netlink.Qdisc) error { cmd := fmt.Sprintf("tc qdisc del %s", qdisc.Attrs().String()) - Log.Infof(cmd) + Log.Info(cmd) err := netlink.QdiscDel(qdisc) if err != nil { return fmt.Errorf("error %s, %w", cmd, err)