Merge pull request #8947 from Luap99/cleanup-code

Fix problems reported by staticcheck
This commit is contained in:
OpenShift Merge Robot
2021-01-12 13:15:35 -05:00
committed by GitHub
28 changed files with 55 additions and 105 deletions

View File

@ -1387,6 +1387,7 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p
logDriverArg = define.NoLogging
case define.JSONLogging:
fallthrough
//lint:ignore ST1015 the default case has to be here
default: //nolint-stylecheck
// No case here should happen except JSONLogging, but keep this here in case the options are extended
logrus.Errorf("%s logging specified but not supported. Choosing k8s-file logging instead", ctr.LogDriver())