k8s-merge-robot 0ff40f3a19 Merge pull request #29103 from xiangpengzhao/fix_if_conditions ...

Automatic merge from submit-queue

Fix incorrect if conditions

When the current conditions `if inspect == nil && inspect.Config == nil && inspect.Config.Labels == nil` is true, the func containerAndPodFromLabels will return. else will not. Suppose `inspect != nil` but `inspect.Config == nil`, the current conditions will be false and the func won't return, then the below `labels := inspect.Config.Labels` will lead to panic.

2016-07-21 12:25:10 -07:00

..

api/v1alpha1

Merge pull request #17048 from feiskyer/kubelet/client-server-proposal

2016-07-11 19:26:51 -07:00

cadvisor

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

client

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

cm

Make volume unmount more robust using exclusive mount w/ O_EXCL

2016-07-18 16:20:08 -07:00

config

Merge pull request #28865 from ronnielai/image-gc-0

2016-07-18 22:54:03 -07:00

container

Moving image pullers to images directory

2016-07-20 09:47:11 -07:00

custommetrics

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

dockertools

Fix incorrect if conditions and add test case

2016-07-20 20:50:02 -04:00

envvars

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

events

Moving event.go from kubelet/container to kubelet/events

2016-07-12 17:42:29 -07:00

eviction

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

images

Wrapping image pullers inside ImageManager

2016-07-20 09:47:11 -07:00

leaky

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

lifecycle

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

metrics

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

network

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

pleg

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

pod

kubelet: delete unused pod manager method

2016-07-08 15:15:54 -07:00

prober

Merge pull request #28865 from ronnielai/image-gc-0

2016-07-18 22:54:03 -07:00

qos

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

rkt

Merge pull request #29145 from yifan-gu/no_chtime

2016-07-21 05:20:15 -07:00

server

Merge pull request #28281 from nhlfr/authorize-return-bool

2016-07-18 21:40:26 -07:00

status

Move ActiveDeadlineSeconds to use lifecycle observers

2016-07-07 13:43:55 -04:00

types

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

util

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

volumemanager

Allow mounts to run in parallel for non-attachable

2016-07-19 21:54:26 -07:00

active_deadline_test.go

Move ActiveDeadlineSeconds to use lifecycle observers

2016-07-07 13:43:55 -04:00

active_deadline.go

Move ActiveDeadlineSeconds to use lifecycle observers

2016-07-07 13:43:55 -04:00

container_bridge.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

disk_manager_test.go

Revert "Declare out of disk when there is no free inodes"

2016-07-06 08:19:09 -07:00

disk_manager.go

Revert "Declare out of disk when there is no free inodes"

2016-07-06 08:19:09 -07:00

doc.go

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

flannel_helper.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

image_manager_test.go

Support deleting all unused images

2016-07-13 18:20:16 -07:00

image_manager.go

Merge pull request #28865 from ronnielai/image-gc-0

2016-07-18 22:54:03 -07:00

kubelet_cadvisor_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubelet_cadvisor.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubelet_getters_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubelet_getters.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubelet_network_test.go

Extract kubelet network code into its own file

2016-07-08 15:18:07 -04:00

kubelet_network.go

Extract kubelet network code into its own file

2016-07-08 15:18:07 -04:00

kubelet_resources_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubelet_resources.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubelet_test.go

Move ExtractPodBandwidthResources test into appropriate package

2016-07-19 14:34:08 -04:00

kubelet_volumes.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

kubelet.go

Remove duplicate code

2016-07-19 14:51:25 -07:00

networks.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

oom_watcher_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

oom_watcher.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

OWNERS

Move blunderbuss assignees into tree

2016-03-02 20:46:32 -05:00

pod_workers_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

pod_workers.go

Moving event.go from kubelet/container to kubelet/events

2016-07-12 17:42:29 -07:00

reason_cache_test.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

reason_cache.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

root_context_linux.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

root_context_unsupported.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

runonce_test.go

Make volume unmount more robust using exclusive mount w/ O_EXCL

2016-07-18 16:20:08 -07:00

runonce.go

Optimizing the processing flow of HandlePodAdditions and canAdmitPod methods.

2016-07-11 10:34:51 +08:00

runtime.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

util.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

volume_host.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00