github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101000 from lojies/ominilcheckforlen

Browse Source 
code cleanup: Omit redundant nil check on slices
This commit is contained in:
Kubernetes Prow Robot 2021-04-14 07:02:43 -07:00 committed by GitHub
commit 80085be866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
View File

@ -326,7 +326,7 @@ func removeNodeIDFromNode(csiDriverName string) nodeUpdateFunc {
// topology information.
func updateTopologyLabels(topology map[string]string) nodeUpdateFunc {
return func(node *v1.Node) (*v1.Node, bool, error) {
if topology == nil || len(topology) == 0 {
if len(topology) == 0 {
return node, false, nil
}

2
pkg/volume/iscsi/iscsi_util.go
View File

@ -791,7 +791,7 @@ func extractDeviceAndPrefix(mntPath string) (string, string, error) {
func extractIface(mntPath string) (string, bool) {
reOutput := ifaceRe.FindStringSubmatch(mntPath)
if reOutput != nil && len(reOutput) > 1 {
if len(reOutput) > 1 {
return reOutput[1], true
}

4
pkg/volume/testing/testing.go
View File

@ -380,9 +380,9 @@ func (plugin *FakeVolumePlugin) NewDetacher() (Detacher, error) {
plugin.NewDetacherCallCount = plugin.NewDetacherCallCount + 1
detacher := plugin.getFakeVolume(&plugin.Detachers)
attacherList := plugin.Attachers
if attacherList != nil && len(attacherList) > 0 {
if len(attacherList) > 0 {
detacherList := plugin.Detachers
if detacherList != nil && len(detacherList) > 0 {
if len(detacherList) > 0 {
detacherList[0].VolumesAttached = attacherList[0].VolumesAttached
}

2
staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors.go
View File

@ -181,7 +181,7 @@ func Invalid(field *Path, value interface{}, detail string) *Error {
// valid values).
func NotSupported(field *Path, value interface{}, validValues []string) *Error {
detail := ""
if validValues != nil && len(validValues) > 0 {
if len(validValues) > 0 {
quotedValues := make([]string, len(validValues))
for i, v := range validValues {
quotedValues[i] = strconv.Quote(v)