From bbd4fea21c45aad098821a285eb3cbb0619edac1 Mon Sep 17 00:00:00 2001 From: Guangming Wang Date: Thu, 23 Apr 2020 20:28:14 +0800 Subject: [PATCH] cleanup: delete unnacessary nil check before range --- test/utils/runners.go | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/test/utils/runners.go b/test/utils/runners.go index fde5a703071..3de82847697 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -635,37 +635,27 @@ func (config *RCConfig) create() error { } func (config *RCConfig) applyTo(template *v1.PodTemplateSpec) { - if config.Env != nil { - for k, v := range config.Env { - c := &template.Spec.Containers[0] - c.Env = append(c.Env, v1.EnvVar{Name: k, Value: v}) - } + for k, v := range config.Env { + c := &template.Spec.Containers[0] + c.Env = append(c.Env, v1.EnvVar{Name: k, Value: v}) } - if config.Labels != nil { - for k, v := range config.Labels { - template.ObjectMeta.Labels[k] = v - } + for k, v := range config.Labels { + template.ObjectMeta.Labels[k] = v } - if config.NodeSelector != nil { - template.Spec.NodeSelector = make(map[string]string) - for k, v := range config.NodeSelector { - template.Spec.NodeSelector[k] = v - } + template.Spec.NodeSelector = make(map[string]string) + for k, v := range config.NodeSelector { + template.Spec.NodeSelector[k] = v } if config.Tolerations != nil { template.Spec.Tolerations = append([]v1.Toleration{}, config.Tolerations...) } - if config.Ports != nil { - for k, v := range config.Ports { - c := &template.Spec.Containers[0] - c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v)}) - } + for k, v := range config.Ports { + c := &template.Spec.Containers[0] + c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v)}) } - if config.HostPorts != nil { - for k, v := range config.HostPorts { - c := &template.Spec.Containers[0] - c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v), HostPort: int32(v)}) - } + for k, v := range config.HostPorts { + c := &template.Spec.Containers[0] + c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v), HostPort: int32(v)}) } if config.CpuLimit > 0 || config.MemLimit > 0 || config.GpuLimit > 0 { template.Spec.Containers[0].Resources.Limits = v1.ResourceList{}