Skip to content

Commit edf85b6

Browse files
committed
Automatically merge main into gh-pages
2 parents fa76729 + 3f37c52 commit edf85b6

File tree

81 files changed

+3746
-876
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3746
-876
lines changed

.github/workflows/build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ jobs:
7474
run: make vet
7575

7676
- name: lint
77-
uses: golangci/golangci-lint-action@v6
77+
uses: golangci/golangci-lint-action@v8
7878
with:
79-
version: v1.64.5
79+
version: v2.1.5
8080

8181
- name: Helm Lint
8282
run: make helm-lint

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
password: ${{ secrets.DOCKER_PASSWORD }}
113113

114114
- name: Install devbox
115-
uses: jetify-com/devbox-install-action@v0.12.0
115+
uses: jetify-com/devbox-install-action@v0.13.0
116116

117117
- name: Setup CAPL Management Kind Cluster and CAPL Child Cluster For Testing
118118
run: devbox run mgmt-and-capl-cluster

.golangci.yml

Lines changed: 131 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,206 +1,187 @@
1+
version: "2"
12
run:
2-
timeout: 5m
33
issues-exit-code: 1
4-
54
output:
65
formats:
7-
- format: colored-line-number
8-
9-
linters-settings:
10-
cyclop:
11-
max-complexity: 15
12-
13-
depguard:
14-
rules:
15-
main:
16-
files:
17-
- "$all"
18-
- "!$test"
19-
deny:
20-
# TODO: Remove reflect from loadbalancers.go and reinstate this requirement
21-
#- pkg: "reflect"
22-
# desc: "Reflection is never clear."
23-
- pkg: "gob"
24-
desc: "Please convert types manually"
25-
26-
dupl:
27-
threshold: 100
28-
29-
errcheck:
30-
check-type-assertions: true
31-
check-blank: true
32-
exclude-functions:
33-
- fmt:.*
34-
- io/ioutil:^Read.*
35-
36-
gci:
37-
sections:
38-
- standard
39-
- default
40-
- blank
41-
- dot
42-
- prefix(github.com/linode/linode-cloud-controller-manager)
43-
44-
goconst:
45-
min-len: 3
46-
min-occurrences: 5
47-
48-
gocritic:
49-
enabled-tags:
50-
- diagnostic
51-
- experimental
52-
- opinionated
53-
- performance
54-
- style
55-
56-
settings:
57-
captLocal:
58-
paramsOnly: true
59-
rangeValCopy:
60-
sizeThreshold: 32
61-
62-
gofmt:
63-
simplify: true
64-
65-
goimports:
66-
local-prefixes: github.com/linode/linode-cloud-controller-manager
67-
68-
govet:
69-
enable:
70-
- shadow
71-
72-
gosec:
73-
confidence: "medium"
74-
excludes:
75-
- G115
76-
77-
mnd:
78-
checks:
79-
- case
80-
- condition
81-
- operation
82-
- return
83-
# Ignoring argument and assign due to the number of cases we're ignoring
84-
85-
nolintlint:
86-
require-explanation: true
87-
require-specific: true
88-
89-
prealloc:
90-
simple: true
91-
range-loops: true
92-
for-loops: true
93-
94-
varnamelen:
95-
min-name-length: 2
96-
6+
text:
7+
path: stdout
978
linters:
98-
disable-all: true
9+
default: none
9910
enable:
100-
# these are enabled by default
101-
- errcheck
102-
- gosimple
103-
- govet
104-
- ineffassign
105-
- staticcheck
106-
- typecheck
107-
- unused
108-
- ginkgolinter
10911
- asasalint
11012
- asciicheck
11113
- bidichk
11214
- bodyclose
11315
- containedctx
11416
- contextcheck
11517
- copyloopvar
116-
#- cyclop
11718
- decorder
11819
- depguard
11920
- dogsled
12021
- dupl
12122
- dupword
12223
- durationcheck
24+
- errcheck
12325
- errchkjson
12426
- errname
12527
- errorlint
12628
- exhaustive
12729
- forbidigo
12830
- forcetypeassert
129-
- gci
31+
- ginkgolinter
13032
- gocheckcompilerdirectives
131-
- gofmt
132-
- goimports
133-
#- gocognit
33+
- gochecksumtype
13434
- goconst
135-
#- gocritic
136-
- gofumpt
13735
- goprintffuncname
13836
- gosec
37+
- gosmopolitan
38+
- govet
13939
- importas
40+
- ineffassign
14041
- loggercheck
14142
- maintidx
14243
- makezero
14344
- misspell
14445
- mnd
14546
- musttag
146-
#- nestif
14747
- nilerr
48+
- nilnesserr
14849
- nilnil
14950
- noctx
15051
- nolintlint
15152
- nosprintfhostport
152-
#- paralleltest # adding t.Parallel() to tests broke so many and made others flaky
15353
- prealloc
15454
- predeclared
55+
- protogetter
15556
- reassign
57+
- recvcheck
58+
- rowserrcheck
59+
- spancheck
60+
- sqlclosecheck
61+
- staticcheck
15662
- testifylint
15763
- thelper
15864
- unconvert
15965
- unparam
66+
- unused
16067
- usestdlibvars
16168
- usetesting
16269
- varnamelen
16370
- wastedassign
16471
- whitespace
165-
166-
presets:
167-
- bugs
168-
- unused
169-
fast: false
170-
72+
- zerologlint
73+
settings:
74+
cyclop:
75+
max-complexity: 15
76+
depguard:
77+
rules:
78+
main:
79+
files:
80+
- $all
81+
- '!$test'
82+
deny:
83+
- pkg: gob
84+
desc: Please convert types manually
85+
dupl:
86+
threshold: 100
87+
errcheck:
88+
check-type-assertions: true
89+
check-blank: true
90+
exclude-functions:
91+
- fmt:.*
92+
- io/ioutil:^Read.*
93+
goconst:
94+
min-len: 3
95+
min-occurrences: 5
96+
gocritic:
97+
enabled-tags:
98+
- diagnostic
99+
- experimental
100+
- opinionated
101+
- performance
102+
- style
103+
settings:
104+
captLocal:
105+
paramsOnly: true
106+
rangeValCopy:
107+
sizeThreshold: 32
108+
gosec:
109+
excludes:
110+
- G115
111+
confidence: medium
112+
govet:
113+
enable:
114+
- shadow
115+
mnd:
116+
checks:
117+
- case
118+
- condition
119+
- operation
120+
- return
121+
nolintlint:
122+
require-explanation: true
123+
require-specific: true
124+
prealloc:
125+
simple: true
126+
range-loops: true
127+
for-loops: true
128+
varnamelen:
129+
min-name-length: 2
130+
exclusions:
131+
generated: lax
132+
rules:
133+
- linters:
134+
- copyloopvar
135+
- dupl
136+
- errcheck
137+
- gocyclo
138+
- gosec
139+
- maintidx
140+
- unparam
141+
- varnamelen
142+
path: _test(ing)?\.go
143+
- linters:
144+
- gocritic
145+
path: _test\.go
146+
text: (unnamedResult|exitAfterDefer)
147+
- linters:
148+
- gosec
149+
text: 'G101:'
150+
- linters:
151+
- gosec
152+
text: 'G104:'
153+
paths:
154+
- zz_generated\..+\.go$
155+
- third_party$
156+
- builtin$
157+
- examples$
171158
issues:
172-
exclude-rules:
173-
# Exclude some linters from running on tests files.
174-
- path: _test(ing)?\.go
175-
linters:
176-
- gocyclo
177-
- maintidx
178-
- errcheck
179-
- dupl
180-
- gosec
181-
- copyloopvar
182-
- unparam
183-
- varnamelen
184-
185-
# Ease some gocritic warnings on test files.
186-
- path: _test\.go
187-
text: "(unnamedResult|exitAfterDefer)"
188-
linters:
189-
- gocritic
190-
191-
- text: "G101:"
192-
linters:
193-
- gosec
194-
- gas
195-
196-
- text: "G104:"
197-
linters:
198-
- gosec
199-
- gas
200-
201-
exclude-use-default: false
202-
new: false
203159
max-issues-per-linter: 0
204160
max-same-issues: 0
205-
exclude-files:
206-
- "zz_generated\\..+\\.go$"
161+
new: false
162+
formatters:
163+
enable:
164+
- gci
165+
- gofmt
166+
- gofumpt
167+
- goimports
168+
settings:
169+
gci:
170+
sections:
171+
- standard
172+
- default
173+
- blank
174+
- dot
175+
- prefix(github.com/linode/linode-cloud-controller-manager)
176+
gofmt:
177+
simplify: true
178+
goimports:
179+
local-prefixes:
180+
- github.com/linode/linode-cloud-controller-manager
181+
exclusions:
182+
generated: lax
183+
paths:
184+
- zz_generated\..+\.go$
185+
- third_party$
186+
- builtin$
187+
- examples$

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ COPY sentry ./sentry
1111
RUN go mod download
1212
RUN go build -a -ldflags '-extldflags "-static"' -o /bin/linode-cloud-controller-manager-linux /linode
1313

14-
FROM alpine:3.21.3
14+
FROM alpine:3.22.0
1515
RUN apk add --update --no-cache ca-certificates
1616
LABEL maintainers="Linode"
1717
LABEL description="Linode Cloud Controller Manager"

0 commit comments

Comments
 (0)