github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use make slice to store objects to improve efficiency 

Signed-off-by: allencloud <allen.sun@daocloud.io>
pull/6/head
allencloud 2017-05-05 23:25:56 +08:00
parent 4e74c43e9a
commit 503c19aec3
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockershim/docker_container.go
View File

@ -350,7 +350,7 @@ func (ds *dockerService) ContainerStatus(containerID string) (*runtimeapi.Contai
imageID := toPullableImageID(r.Image, ir) imageID := toPullableImageID(r.Image, ir)
// Convert the mounts. // Convert the mounts.
mounts := []*runtimeapi.Mount{} mounts := make([]*runtimeapi.Mount, 0, len(r.Mounts))
for i := range r.Mounts { for i := range r.Mounts {
m := r.Mounts[i] m := r.Mounts[i]
readonly := !m.RW readonly := !m.RW

2
pkg/kubelet/dockershim/docker_image.go
View File

@ -40,7 +40,7 @@ func (ds *dockerService) ListImages(filter *runtimeapi.ImageFilter) ([]*runtimea
return nil, err return nil, err
} }
result := []*runtimeapi.Image{} result := make([]*runtimeapi.Image, 0, len(images))
for _, i := range images { for _, i := range images {
apiImage, err := imageToRuntimeAPIImage(&i) apiImage, err := imageToRuntimeAPIImage(&i)
if err != nil { if err != nil {

4
pkg/kubelet/dockershim/docker_legacy.go
View File

@ -187,7 +187,7 @@ func (ds *dockerService) ListLegacyPodSandbox(filter *runtimeapi.PodSandboxFilte
} }
// Convert docker containers to runtime api sandboxes. // Convert docker containers to runtime api sandboxes.
result := []*runtimeapi.PodSandbox{} result := make([]*runtimeapi.PodSandbox, 0, len(containers))
for i := range containers { for i := range containers {
c := containers[i] c := containers[i]
// Skip new containers with containerTypeLabelKey label. // Skip new containers with containerTypeLabelKey label.
@ -242,7 +242,7 @@ func (ds *dockerService) ListLegacyContainers(filter *runtimeapi.ContainerFilter
} }
// Convert docker to runtime api containers. // Convert docker to runtime api containers.
result := []*runtimeapi.Container{} result := make([]*runtimeapi.Container, 0, len(containers))
for i := range containers { for i := range containers {
c := containers[i] c := containers[i]
// Skip new containers with containerTypeLabelKey label. // Skip new containers with containerTypeLabelKey label.

2
pkg/kubelet/dockershim/docker_service.go
View File

@ -335,7 +335,7 @@ func (ds *dockerService) GetPodPortMappings(podSandboxID string) ([]*hostport.Po
} }
} }
portMappings := []*hostport.PortMapping{} portMappings := make([]*hostport.PortMapping, 0, len(checkpoint.Data.PortMappings))
for _, pm := range checkpoint.Data.PortMappings { for _, pm := range checkpoint.Data.PortMappings {
proto := toAPIProtocol(*pm.Protocol) proto := toAPIProtocol(*pm.Protocol)
portMappings = append(portMappings, &hostport.PortMapping{ portMappings = append(portMappings, &hostport.PortMapping{

5
pkg/kubelet/dockershim/helpers.go
View File

@ -127,7 +127,8 @@ func extractLabels(input map[string]string) (map[string]string, map[string]strin
// '<HostPath>:<ContainerPath>:ro', if the path is read only, or // '<HostPath>:<ContainerPath>:ro', if the path is read only, or
// '<HostPath>:<ContainerPath>:Z', if the volume requires SELinux // '<HostPath>:<ContainerPath>:Z', if the volume requires SELinux
// relabeling and the pod provides an SELinux label // relabeling and the pod provides an SELinux label
func generateMountBindings(mounts []*runtimeapi.Mount) (result []string) { func generateMountBindings(mounts []*runtimeapi.Mount) []string {
result := make([]string, 0, len(mounts))
for _, m := range mounts { for _, m := range mounts {
bind := fmt.Sprintf("%s:%s", m.HostPath, m.ContainerPath) bind := fmt.Sprintf("%s:%s", m.HostPath, m.ContainerPath)
readOnly := m.Readonly readOnly := m.Readonly
@ -147,7 +148,7 @@ func generateMountBindings(mounts []*runtimeapi.Mount) (result []string) {
} }
result = append(result, bind) result = append(result, bind)
} }
return return result
} }
func makePortsAndBindings(pm []*runtimeapi.PortMapping) (map[dockernat.Port]struct{}, map[dockernat.Port][]dockernat.PortBinding) { func makePortsAndBindings(pm []*runtimeapi.PortMapping) (map[dockernat.Port]struct{}, map[dockernat.Port][]dockernat.PortBinding) {