Skip to content

Commit

Permalink
Bump golangci-lint + fix lint issues
Browse files Browse the repository at this point in the history
Signed-off-by: Volker Theile <[email protected]>
(cherry picked from commit a754baf)

Conflicts:
	Dockerfile.dapper
          - update the golangci-lint version
	cmd/webhook/main.go
	  - did not introduce to v0.1.x
  • Loading branch information
votdev authored and Vicente-Cheng committed Apr 17, 2024
1 parent 1eb6310 commit 1935e90
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN zypper -n rm container-suseconnect && \

## install golangci
RUN if [ "${ARCH}" == "amd64" ]; then \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.0; \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.57.1; \
fi
## install controller-gen
RUN if [ "${ARCH}" = "amd64" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func main() {
},
}

app.Action = func(c *cli.Context) error {
app.Action = func(_ *cli.Context) error {
initProfiling(&opt)
initLogs(&opt)
return run(&opt)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ksmtuned/ksmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (k *ksmd) toggleMergeAcrossNodes(ctx context.Context, toggle uint) (err err
}

ctxCancel, cancel := context.WithCancel(ctx)
wait.UntilWithContext(ctxCancel, func(ctx context.Context) {
wait.UntilWithContext(ctxCancel, func(_ context.Context) {
var s *ksmdStatus
s, err = k.readKsmdStatus()
if err != nil || s.shared+s.sharing+s.unshared < 1 {
Expand Down

0 comments on commit 1935e90

Please sign in to comment.