github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90404 from beautytiger/200423-nil-check

Browse Source 
cleanup: delete unnacessary nil check before range
This commit is contained in:
Kubernetes Prow Robot 2020-04-24 04:42:06 -07:00 committed by GitHub
commit 70c18e4a15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/utils/runners.go
View File

@ -635,37 +635,27 @@ func (config *RCConfig) create() error {
} }
func (config *RCConfig) applyTo(template *v1.PodTemplateSpec) { func (config *RCConfig) applyTo(template *v1.PodTemplateSpec) {
if config.Env != nil { for k, v := range config.Env {
for k, v := range config.Env { c := &template.Spec.Containers[0]
c := &template.Spec.Containers[0] c.Env = append(c.Env, v1.EnvVar{Name: k, Value: v})
c.Env = append(c.Env, v1.EnvVar{Name: k, Value: v})
}
} }
if config.Labels != nil { for k, v := range config.Labels {
for k, v := range config.Labels { template.ObjectMeta.Labels[k] = v
template.ObjectMeta.Labels[k] = v
}
} }
if config.NodeSelector != nil { template.Spec.NodeSelector = make(map[string]string)
template.Spec.NodeSelector = make(map[string]string) for k, v := range config.NodeSelector {
for k, v := range config.NodeSelector { template.Spec.NodeSelector[k] = v
template.Spec.NodeSelector[k] = v
}
} }
if config.Tolerations != nil { if config.Tolerations != nil {
template.Spec.Tolerations = append([]v1.Toleration{}, config.Tolerations...) template.Spec.Tolerations = append([]v1.Toleration{}, config.Tolerations...)
} }
if config.Ports != nil { for k, v := range config.Ports {
for k, v := range config.Ports { c := &template.Spec.Containers[0]
c := &template.Spec.Containers[0] c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v)})
c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v)})
}
} }
if config.HostPorts != nil { for k, v := range config.HostPorts {
for k, v := range config.HostPorts { c := &template.Spec.Containers[0]
c := &template.Spec.Containers[0] c.Ports = append(c.Ports, v1.ContainerPort{Name: k, ContainerPort: int32(v), HostPort: int32(v)})
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 { if config.CpuLimit > 0 || config.MemLimit > 0 || config.GpuLimit > 0 {
template.Spec.Containers[0].Resources.Limits = v1.ResourceList{} template.Spec.Containers[0].Resources.Limits = v1.ResourceList{}