Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

golangci-lint: Update to v1.51.2 #24153

Merged
merged 3 commits into from
Mar 7, 2023
Merged

golangci-lint: Update to v1.51.2 #24153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9124da1
golangci-lint: Update to v1.51.2
mhofstetter Mar 3, 2023
d3465d8
golangci-lint: remove deprecated linter varcheck
mhofstetter Mar 3, 2023
6b62290
golangci-lint: fix unused issues in lbipam
mhofstetter Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint-go.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Run golangci-lint
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3.4.0
with:
version: v1.51.0
version: v1.51.2
skip-cache: true

precheck:
Expand Down
1 change: 0 additions & 1 deletion .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ linters:
- misspell
- staticcheck
- unused
- varcheck
- goheader
- gosec

Expand Down
4 changes: 2 additions & 2 deletions Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ ifneq ($(V),0)
endif
endif

GOLANGCILINT_WANT_VERSION = 1.51.0
GOLANGCILINT_IMAGE_SHA = sha256:06c7e2e557603b122aaa7db5568b6328b980c6746ba7eb9652cf4ca4359e42d6
GOLANGCILINT_WANT_VERSION = 1.51.2
GOLANGCILINT_IMAGE_SHA = sha256:be42f5df32011553183947c2b2502718bde485f566e15bbd2541f38a077e4d29
GOLANGCILINT_VERSION = $(shell golangci-lint version 2>/dev/null)

VERSION = $(shell cat $(dir $(lastword $(MAKEFILE_LIST)))/VERSION)
Expand Down
5 changes: 1 addition & 4 deletions operator/pkg/lbipam/lbipam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,6 @@ func (ipam *LBIPAM) restart() {
})
}

type ipPoolEvent = resource.Event[*cilium_api_v2alpha1.CiliumLoadBalancerIPPool]
type svcEvent = resource.Event[*slim_core_v1.Service]

func (ipam *LBIPAM) Run(ctx context.Context) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
Expand Down Expand Up @@ -939,7 +936,7 @@ func (ipam *LBIPAM) findRangeOfIP(sv *ServiceView, ip net.IP) (lbRange *LBRange,
return r, false, nil
dylandreimerink marked this conversation as resolved.
Show resolved Hide resolved
}

return nil, false, nil
return nil, foundPool, nil
}

// isResponsibleForSVC checks if LB IPAM should allocate and assign IPs or some other controller
Expand Down