Skip to content

Commit 70c18e4

Browse files
authored
Merge pull request kubernetes#90404 from beautytiger/200423-nil-check
cleanup: delete unnacessary nil check before range
2 parents 9706b70 + bbd4fea commit 70c18e4

File tree

1 file changed

+14
-24
lines changed

1 file changed

+14
-24
lines changed

test/utils/runners.go

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -635,37 +635,27 @@ func (config *RCConfig) create() error {
635635
}
636636

637637
func (config *RCConfig) applyTo(template *v1.PodTemplateSpec) {
638-
if config.Env != nil {
639-
for k, v := range config.Env {
640-
c := &template.Spec.Containers[0]
641-
c.Env = append(c.Env, v1.EnvVar{Name: k, Value: v})
642-
}
638+
for k, v := range config.Env {
639+
c := &template.Spec.Containers[0]
640+
c.Env = append(c.Env, v1.EnvVar{Name: k, Value: v})
643641
}
644-
if config.Labels != nil {
645-
for k, v := range config.Labels {
646-
template.ObjectMeta.Labels[k] = v
647-
}
642+
for k, v := range config.Labels {
643+
template.ObjectMeta.Labels[k] = v
648644
}
649-
if config.NodeSelector != nil {
650-
template.Spec.NodeSelector = make(map[string]string)
651-
for k, v := range config.NodeSelector {
652-
template.Spec.NodeSelector[k] = v
653-
}
645+
template.Spec.NodeSelector = make(map[string]string)
646+
for k, v := range config.NodeSelector {
647+
template.Spec.NodeSelector[k] = v
654648
}
655649
if config.Tolerations != nil {
656650
template.Spec.Tolerations = append([]v1.Toleration{}, config.Tolerations...)
657651
}
658-
if config.Ports != nil {
659-
for k, v := range config.Ports {
660-
c := &template.Spec.Containers[0]
661-
c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v)})
662-
}
652+
for k, v := range config.Ports {
653+
c := &template.Spec.Containers[0]
654+
c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v)})
663655
}
664-
if config.HostPorts != nil {
665-
for k, v := range config.HostPorts {
666-
c := &template.Spec.Containers[0]
667-
c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v), HostPort: int32(v)})
668-
}
656+
for k, v := range config.HostPorts {
657+
c := &template.Spec.Containers[0]
658+
c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v), HostPort: int32(v)})
669659
}
670660
if config.CpuLimit > 0 || config.MemLimit > 0 || config.GpuLimit > 0 {
671661
template.Spec.Containers[0].Resources.Limits = v1.ResourceList{}

0 commit comments

Comments
 (0)