github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5001 from kzys/no-lint-upgrade

Browse Source
This commit is contained in:
Akihiro Suda 2021-02-06 00:40:38 +09:00 committed by GitHub
commit e908be5b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
- uses: golangci/golangci-lint-action@v2 - uses: golangci/golangci-lint-action@v2
with: with:
version: v1.29.0 version: v1.36.0
working-directory: src/github.com/containerd/containerd working-directory: src/github.com/containerd/containerd
args: --timeout=5m args: --timeout=5m

4
pkg/cri/server/container_create_linux.go
View File

@ -310,7 +310,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
asp := securityContext.GetApparmor() asp := securityContext.GetApparmor()
if asp == nil { if asp == nil {
asp, err = generateApparmorSecurityProfile(securityContext.GetApparmorProfile()) // nolint:staticcheck deprecated but we don't want to remove yet asp, err = generateApparmorSecurityProfile(securityContext.GetApparmorProfile()) //nolint:staticcheck // Deprecated but we don't want to remove yet
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to generate apparmor spec opts") return nil, errors.Wrap(err, "failed to generate apparmor spec opts")
} }
@ -329,7 +329,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
ssp := securityContext.GetSeccomp() ssp := securityContext.GetSeccomp()
if ssp == nil { if ssp == nil {
ssp, err = generateSeccompSecurityProfile( ssp, err = generateSeccompSecurityProfile(
securityContext.GetSeccompProfilePath(), // nolint:staticcheck deprecated but we don't want to remove yet securityContext.GetSeccompProfilePath(), //nolint:staticcheck // Deprecated but we don't want to remove yet
c.config.UnsetSeccompProfile) c.config.UnsetSeccompProfile)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to generate seccomp spec opts") return nil, errors.Wrap(err, "failed to generate seccomp spec opts")

2
pkg/cri/server/sandbox_run_linux.go
View File

@ -170,7 +170,7 @@ func (c *criService) sandboxContainerSpecOpts(config *runtime.PodSandboxConfig,
ssp := securityContext.GetSeccomp() ssp := securityContext.GetSeccomp()
if ssp == nil { if ssp == nil {
ssp, err = generateSeccompSecurityProfile( ssp, err = generateSeccompSecurityProfile(
securityContext.GetSeccompProfilePath(), // nolint:staticcheck deprecated but we don't want to remove yet securityContext.GetSeccompProfilePath(), //nolint:staticcheck // Deprecated but we don't want to remove yet
c.config.UnsetSeccompProfile) c.config.UnsetSeccompProfile)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to generate seccomp spec opts") return nil, errors.Wrap(err, "failed to generate seccomp spec opts")