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

Merge pull request #8496 from ktock/golangci-lint-1.52.2

Browse Source 
Bump up golangci-lint to v1.52.2
This commit is contained in:
Phil Estes
2023-05-09 13:03:06 -07:00
committed by GitHub
parent 43bbffba37 6e2c915a44
commit c6d7e45c14
6 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/sbserver/images/image_pull.go
View File

@@ -361,7 +361,8 @@ func (c *CRIImageService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (*
if len(cert.Certificate) != 0 {
tlsConfig.Certificates = []tls.Certificate{cert}
}
tlsConfig.BuildNameToCertificate() //nolint:staticcheck // TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833
// TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833
tlsConfig.BuildNameToCertificate() //nolint:staticcheck
}
if registryTLSConfig.CAFile != "" {

3
pkg/cri/server/image_pull.go
View File

@@ -343,7 +343,8 @@ func (c *criService) getTLSConfig(registryTLSConfig criconfig.TLSConfig) (*tls.C
if len(cert.Certificate) != 0 {
tlsConfig.Certificates = []tls.Certificate{cert}
}
tlsConfig.BuildNameToCertificate() //nolint:staticcheck // TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833
// TODO(thaJeztah): verify if we should ignore the deprecation; see https://github.com/containerd/containerd/pull/7349/files#r990644833
tlsConfig.BuildNameToCertificate() //nolint:staticcheck
}
if registryTLSConfig.CAFile != "" {