Skip to content

Commit 0ba486d

Browse files
Merge pull request #66 from Mellanox/dependabot/go_modules/github.com/Mellanox/maintenance-operator/api-0.2.0
chore(deps): bump github.com/Mellanox/maintenance-operator/api from 0.0.0-20240916123230-810ab7bb25f4 to 0.2.0
2 parents 9a9e64b + f4801f3 commit 0ba486d

File tree

7 files changed

+44
-52
lines changed

7 files changed

+44
-52
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ linters:
2525
enable:
2626
- dupl
2727
- errcheck
28-
- exportloopref
28+
- copyloopvar
2929
- goconst
3030
- gocyclo
3131
- gofmt

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
249249
KUSTOMIZE_VERSION ?= v5.3.0
250250
CONTROLLER_TOOLS_VERSION ?= v0.14.0
251251
ENVTEST_VERSION ?= release-0.19
252-
GOLANGCI_LINT_VERSION ?= v1.57.2
252+
GOLANGCI_LINT_VERSION ?= v1.64.2
253253

254254
.PHONY: kustomize
255255
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

go.mod

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/Mellanox/nic-configuration-operator
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.4
5+
toolchain go1.23.6
66

77
require (
8-
github.com/Mellanox/maintenance-operator/api v0.0.0-20240916123230-810ab7bb25f4
8+
github.com/Mellanox/maintenance-operator/api v0.2.0
99
github.com/Mellanox/rdmamap v1.1.0
1010
github.com/jaypipes/ghw v0.12.0
1111
github.com/jaypipes/pcidb v1.0.1
@@ -14,11 +14,11 @@ require (
1414
github.com/stretchr/testify v1.10.0
1515
github.com/vishvananda/netlink v1.3.0
1616
go.uber.org/zap v1.26.0
17-
k8s.io/api v0.31.5
18-
k8s.io/apimachinery v0.31.5
19-
k8s.io/client-go v0.31.5
20-
k8s.io/utils v0.0.0-20240821151609-f90d01438635
21-
sigs.k8s.io/controller-runtime v0.19.0
17+
k8s.io/api v0.32.0
18+
k8s.io/apimachinery v0.32.0
19+
k8s.io/client-go v0.32.0
20+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
21+
sigs.k8s.io/controller-runtime v0.19.4
2222
)
2323

2424
require (
@@ -40,14 +40,12 @@ require (
4040
github.com/go-openapi/swag v0.23.0 // indirect
4141
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4242
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4443
github.com/golang/protobuf v1.5.4 // indirect
4544
github.com/google/gnostic-models v0.6.8 // indirect
4645
github.com/google/go-cmp v0.6.0 // indirect
4746
github.com/google/gofuzz v1.2.0 // indirect
4847
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
4948
github.com/google/uuid v1.6.0 // indirect
50-
github.com/imdario/mergo v0.3.16 // indirect
5149
github.com/josharian/intern v1.0.0 // indirect
5250
github.com/json-iterator/go v1.1.12 // indirect
5351
github.com/klauspost/compress v1.17.9 // indirect
@@ -69,22 +67,23 @@ require (
6967
go.uber.org/multierr v1.11.0 // indirect
7068
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
7169
golang.org/x/net v0.33.0 // indirect
72-
golang.org/x/oauth2 v0.22.0 // indirect
70+
golang.org/x/oauth2 v0.23.0 // indirect
7371
golang.org/x/sys v0.28.0 // indirect
7472
golang.org/x/term v0.27.0 // indirect
7573
golang.org/x/text v0.21.0 // indirect
76-
golang.org/x/time v0.6.0 // indirect
74+
golang.org/x/time v0.7.0 // indirect
7775
golang.org/x/tools v0.28.0 // indirect
7876
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7977
google.golang.org/protobuf v1.36.1 // indirect
78+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8079
gopkg.in/inf.v0 v0.9.1 // indirect
8180
gopkg.in/yaml.v2 v2.4.0 // indirect
8281
gopkg.in/yaml.v3 v3.0.1 // indirect
8382
howett.net/plist v1.0.1 // indirect
8483
k8s.io/apiextensions-apiserver v0.31.0 // indirect
8584
k8s.io/klog/v2 v2.130.1 // indirect
86-
k8s.io/kube-openapi v0.0.0-20240826222958-65a50c78dec5 // indirect
87-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
88-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
85+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
86+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
87+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
8988
sigs.k8s.io/yaml v1.4.0 // indirect
9089
)

go.sum

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/Mellanox/maintenance-operator/api v0.0.0-20240916123230-810ab7bb25f4 h1:XTyFEogTo9v/lZXMqKroHSpVimDxYOHvTdwScJHA7v0=
2-
github.com/Mellanox/maintenance-operator/api v0.0.0-20240916123230-810ab7bb25f4/go.mod h1:5OIBO4beWexC3JvLIH1GGNzr49QW7UoZe2LgT/IXYIc=
1+
github.com/Mellanox/maintenance-operator/api v0.2.0 h1:YwKrJ3tveTjnkx/YugzKroOKbOu4oNLKvz4/iW2lB7U=
2+
github.com/Mellanox/maintenance-operator/api v0.2.0/go.mod h1:U9z8ec+Z8v8alkpqzyeJOGuD+KDRL4ouOGf/gk/NEsQ=
33
github.com/Mellanox/rdmamap v1.1.0 h1:A/W1wAXw+6vm58f3VklrIylgV+eDJlPVIMaIKuxgUT4=
44
github.com/Mellanox/rdmamap v1.1.0/go.mod h1:fN+/V9lf10ABnDCwTaXRjeeWijLt2iVLETnK+sx/LY8=
55
github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
@@ -41,8 +41,6 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
4141
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
4242
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
4343
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
44-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
45-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
4644
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
4745
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
4846
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
@@ -57,8 +55,6 @@ github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/Z
5755
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
5856
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
5957
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
60-
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
61-
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
6258
github.com/jaypipes/ghw v0.12.0 h1:xU2/MDJfWmBhJnujHY9qwXQLs3DBsf0/Xa9vECY0Tho=
6359
github.com/jaypipes/ghw v0.12.0/go.mod h1:jeJGbkRB2lL3/gxYzNYzEDETV1ZJ56OKr+CSeSEym+g=
6460
github.com/jaypipes/pcidb v1.0.1 h1:WB2zh27T3nwg8AE8ei81sNRb9yWBii3JGNJtT7K9Oic=
@@ -145,8 +141,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
145141
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
146142
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
147143
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
148-
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
149-
golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
144+
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
145+
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
150146
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
151147
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
152148
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -166,8 +162,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
166162
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
167163
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
168164
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
169-
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
170-
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
165+
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
166+
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
171167
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
172168
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
173169
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -190,32 +186,31 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWM
190186
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
191187
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
192188
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
193-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
194189
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
195190
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
196191
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
197192
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
198193
howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM=
199194
howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
200-
k8s.io/api v0.31.5 h1:7jP74egbPUOCLJV5KheUnwo9gz3zzUsMIj2EPkuYK1E=
201-
k8s.io/api v0.31.5/go.mod h1:RMyMdZG1kJjou2ng5buEti0OHlo0uFXgSzTZ/k5LeVk=
195+
k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
196+
k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
202197
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
203198
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
204-
k8s.io/apimachinery v0.31.5 h1:NxhAVGcfrSdTMx3M2v1OnvcMS7h1ZnWyt2x2z8CJJBU=
205-
k8s.io/apimachinery v0.31.5/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
206-
k8s.io/client-go v0.31.5 h1:rmDswcUaIFAJ5vJaB82pjyqc52DgHCPv0G6af3OupO0=
207-
k8s.io/client-go v0.31.5/go.mod h1:js93IlRSzRHql9o9zP54N56rMR249uH4+srnSOcFLsU=
199+
k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
200+
k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
201+
k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
202+
k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
208203
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
209204
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
210-
k8s.io/kube-openapi v0.0.0-20240826222958-65a50c78dec5 h1:6OWzFh8WiQWeeE7apc3kRV3z0CzprqBxVjntsPA0ed4=
211-
k8s.io/kube-openapi v0.0.0-20240826222958-65a50c78dec5/go.mod h1:i67DWA0Mm5+JPl+R2ku1eehbRGBDthd8+S2jS9nKLQk=
212-
k8s.io/utils v0.0.0-20240821151609-f90d01438635 h1:2wThSvJoW/Ncn9TmQEYXRnevZXi2duqHWf5OX9S3zjI=
213-
k8s.io/utils v0.0.0-20240821151609-f90d01438635/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
214-
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
215-
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
216-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
217-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
218-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
219-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
205+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
206+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
207+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
208+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
209+
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
210+
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
211+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
212+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
213+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
214+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
220215
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
221216
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

internal/controller/nicconfigurationtemplate_controller.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,11 @@ func (r *NicConfigurationTemplateReconciler) Reconcile(ctx context.Context, req
9191

9292
nodeMap := map[string]*v1.Node{}
9393
for _, node := range nodeList.Items {
94-
node := node
9594
nodeMap[node.Name] = &node
9695
}
9796

9897
templates := []*v1alpha1.NicConfigurationTemplate{}
9998
for _, template := range templateList.Items {
100-
template := template
10199
templates = append(templates, &template)
102100
}
103101

@@ -230,7 +228,7 @@ func nodeMatchesTemplate(node *v1.Node, template *v1alpha1.NicConfigurationTempl
230228
}
231229

232230
func deviceMatchesPCISelector(device *v1alpha1.NicDevice, template *v1alpha1.NicConfigurationTemplate) bool {
233-
if template.Spec.NicSelector.PciAddresses != nil && len(template.Spec.NicSelector.PciAddresses) > 0 {
231+
if len(template.Spec.NicSelector.PciAddresses) > 0 {
234232
matchesPCI := false
235233
for _, port := range device.Status.Ports {
236234
if slices.Contains(template.Spec.NicSelector.PciAddresses, port.PCI) {
@@ -246,7 +244,7 @@ func deviceMatchesPCISelector(device *v1alpha1.NicDevice, template *v1alpha1.Nic
246244
}
247245

248246
func deviceMatchesSerialNumberSelector(device *v1alpha1.NicDevice, template *v1alpha1.NicConfigurationTemplate) bool {
249-
if template.Spec.NicSelector.SerialNumbers != nil && len(template.Spec.NicSelector.SerialNumbers) > 0 {
247+
if len(template.Spec.NicSelector.SerialNumbers) > 0 {
250248
if !slices.Contains(template.Spec.NicSelector.SerialNumbers, device.Status.SerialNumber) {
251249
return false
252250
}

test/e2e/e2e_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ import (
2727
// Run e2e tests using the Ginkgo runner.
2828
func TestE2E(t *testing.T) {
2929
RegisterFailHandler(Fail)
30-
fmt.Fprintf(GinkgoWriter, "Starting nic-configuration-operator suite\n")
30+
_, _ = fmt.Fprintf(GinkgoWriter, "Starting nic-configuration-operator suite\n")
3131
RunSpecs(t, "e2e suite")
3232
}

test/utils/utils.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const (
3535
)
3636

3737
func warnError(err error) {
38-
fmt.Fprintf(GinkgoWriter, "warning: %v\n", err)
38+
_, _ = fmt.Fprintf(GinkgoWriter, "warning: %v\n", err)
3939
}
4040

4141
// InstallPrometheusOperator installs the prometheus Operator to be used to export the enabled metrics.
@@ -52,12 +52,12 @@ func Run(cmd *exec.Cmd) ([]byte, error) {
5252
cmd.Dir = dir
5353

5454
if err := os.Chdir(cmd.Dir); err != nil {
55-
fmt.Fprintf(GinkgoWriter, "chdir dir: %s\n", err)
55+
_, _ = fmt.Fprintf(GinkgoWriter, "chdir dir: %s\n", err)
5656
}
5757

5858
cmd.Env = append(os.Environ(), "GO111MODULE=on")
5959
command := strings.Join(cmd.Args, " ")
60-
fmt.Fprintf(GinkgoWriter, "running: %s\n", command)
60+
_, _ = fmt.Fprintf(GinkgoWriter, "running: %s\n", command)
6161
output, err := cmd.CombinedOutput()
6262
if err != nil {
6363
return output, fmt.Errorf("%s failed with error: (%v) %s", command, err, string(output))

0 commit comments

Comments
 (0)