Skip to content

Commit

Permalink
Merge pull request #928 from NVIDIA/fix-govet-issues
Browse files Browse the repository at this point in the history
fix govet issues and pin golangci-lint version
  • Loading branch information
tariq1890 authored Aug 14, 2024
2 parents 0eccf51 + 0237aae commit 300c366
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v6
with:
version: latest
version: v1.60.1
args: -v --timeout 5m
skip-cache: true
- run: make check
Expand Down
2 changes: 1 addition & 1 deletion controllers/object_controls.go
Original file line number Diff line number Diff line change
Expand Up @@ -2846,7 +2846,7 @@ func transformOpenShiftDriverToolkitContainer(obj *appsv1.DaemonSet, config *gpu
return nil, nil
}

return nil, fmt.Errorf(fmt.Sprintf("could not find the '%s' container", name))
return nil, fmt.Errorf("could not find the '%s' container", name)
}

if !n.ocpDriverToolkit.enabled {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/framework/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (f *Framework) AfterEach(ctx context.Context) {
for namespaceKey, namespaceErr := range nsDeletionErrors {
messages = append(messages, fmt.Sprintf("Couldn't delete ns: %q: %s (%#v)", namespaceKey, namespaceErr, namespaceErr))
}
e2elog.Failf(strings.Join(messages, ","))
ginkgo.Fail(strings.Join(messages, ","))
}
}()

Expand Down
2 changes: 1 addition & 1 deletion validator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ func (m *MOFED) validate() error {

present, err := m.isMellanoxDevicePresent()
if err != nil {
log.Errorf(err.Error())
log.Errorf("Error trying to retrieve Mellanox device - %s\n", err.Error())
return err
}
if !present {
Expand Down

0 comments on commit 300c366

Please sign in to comment.