Kubernetes Submit Queue c3df35df7b Merge pull request #44970 from Random-Liu/fix-stop-container-timeout ...

Automatic merge from submit-queue (batch tested with PRs 44970, 43618)

CRI: Fix StopContainer timeout

Fixes https://github.com/kubernetes/kubernetes/issues/44956.

I verified this PR with the example provided in https://github.com/kubernetes/kubernetes/issues/44956, and now pod deletion will respect grace period timeout:
```
NAME                         READY     STATUS        RESTARTS   AGE
gracefully-terminating-pod   1/1       Terminating   0          6m
```

@dchen1107 @yujuhong @feiskyer /cc @kubernetes/sig-node-bugs

2017-04-26 22:58:11 -07:00

..

api

autogenerated

2017-04-14 10:40:57 -07:00

cadvisor

autogenerated

2017-04-14 10:40:57 -07:00

certificate

Add bootstrap support to certificate manager.

2017-04-20 16:27:32 -07:00

client

autogenerated

2017-04-14 10:40:57 -07:00

cm

Registered node before other initialization.

2017-04-18 10:43:56 +08:00

config

autogenerated

2017-04-14 10:40:57 -07:00

container

move pkg/api/v1/ref.go and pkg/api/v1/resource.go to subpackages. move some functions in resource.go to pkg/api/v1/node and pkg/api/v1/pod

2017-04-17 11:38:11 -07:00

custommetrics

Merge pull request #44469 from siggy/siggy/custom-metrics-comment

2017-04-17 19:59:16 -07:00

dockershim

move pkg/api/v1/helpers.go to subpackage

2017-04-14 14:25:11 -07:00

dockertools

Registered node before other initialization.

2017-04-18 10:43:56 +08:00

envvars

move pkg/api/v1/helpers.go to subpackage

2017-04-14 14:25:11 -07:00

events

autogenerated

2017-04-14 10:40:57 -07:00

eviction

still consider quantity reclaimed even when errors are returned

2017-04-26 17:40:30 -07:00

gpu

autogenerated

2017-04-14 10:40:57 -07:00

images

autogenerated

2017-04-14 10:40:57 -07:00

kuberuntime

move pkg/api/v1/ref.go and pkg/api/v1/resource.go to subpackages. move some functions in resource.go to pkg/api/v1/node and pkg/api/v1/pod

2017-04-17 11:38:11 -07:00

leaky

Enable auto-generating sources rules

2017-01-05 14:14:13 -08:00

lifecycle

autogenerated

2017-04-14 10:40:57 -07:00

metrics

autogenerated

2017-04-14 10:40:57 -07:00

network

Merge pull request #44642 from supereagle/fix-comment-error

2017-04-21 11:52:07 -07:00

pleg

autogenerated

2017-04-14 10:40:57 -07:00

pod

autogenerated

2017-04-14 10:40:57 -07:00

preemption

move pkg/api/v1/ref.go and pkg/api/v1/resource.go to subpackages. move some functions in resource.go to pkg/api/v1/node and pkg/api/v1/pod

2017-04-17 11:38:11 -07:00

prober

Merge pull request #42085 from cblecker/gofmt-fix

2017-04-17 15:39:07 -07:00

qos

autogenerated

2017-04-14 10:40:57 -07:00

remote

Fix StopContainer timeout

2017-04-26 15:48:12 -07:00

rkt

Merge pull request #44467 from JulienBalestra/fix-rkt-host-path-volume

2017-04-17 20:06:59 -07:00

rktshim

Merge pull request #39158 from feiskyer/cri-proto3

2017-01-20 08:28:49 -08:00

secret

autogenerated

2017-04-14 10:40:57 -07:00

server

Add redirect support to SpdyRoundTripper

2017-04-26 09:45:19 -04:00

status

move pkg/api/v1/ref.go and pkg/api/v1/resource.go to subpackages. move some functions in resource.go to pkg/api/v1/node and pkg/api/v1/pod

2017-04-17 11:38:11 -07:00

sysctl

move pkg/api/v1/helpers.go to subpackage

2017-04-14 14:25:11 -07:00

types

autogenerated

2017-04-14 10:40:57 -07:00

util

autogenerated

2017-04-14 10:40:57 -07:00

volumemanager

find and add active pods for dswp

2017-04-18 11:21:37 +08:00

active_deadline_test.go

move client/record

2017-01-31 19:14:13 -05:00

active_deadline.go

move client/record

2017-01-31 19:14:13 -05:00

BUILD

move pkg/api/v1/ref.go and pkg/api/v1/resource.go to subpackages. move some functions in resource.go to pkg/api/v1/node and pkg/api/v1/pod

2017-04-17 11:38:11 -07:00

disk_manager_test.go

…

disk_manager.go

…

doc.go

…

kubelet_cadvisor_test.go

Use the assert/require package in kubelet unit tests

2017-03-16 10:21:44 -07:00

kubelet_cadvisor.go

start the apimachinery repo

2017-01-11 09:09:48 -05:00

kubelet_getters_test.go

Use the assert/require package in kubelet unit tests

2017-03-16 10:21:44 -07:00

kubelet_getters.go

kubelet: Fix ConfigMap on Windows.

2017-01-24 18:40:49 +00:00

kubelet_network_test.go

Use the assert/require package in kubelet unit tests

2017-03-16 10:21:44 -07:00

kubelet_network.go

Fixed forming of pod's Search line in resolv.conf:

2017-01-17 13:18:26 +00:00

kubelet_node_status_test.go

Use the assert/require package in kubelet unit tests

2017-03-16 10:21:44 -07:00

kubelet_node_status.go

move pkg/api/v1/helpers.go to subpackage

2017-04-14 14:25:11 -07:00

kubelet_pods_test.go

extract content-generation concern from ensureHostsFile

2017-04-24 12:33:45 -07:00

kubelet_pods_windows_test.go

kubelet: Fix ConfigMap on Windows.

2017-01-24 18:40:49 +00:00

kubelet_pods.go

extract content-generation concern from ensureHostsFile

2017-04-24 12:33:45 -07:00

kubelet_resources_test.go

add support for node allocatable phase 2 to kubelet

2017-02-27 21:24:44 -08:00

kubelet_resources.go

move pkg/api/v1/ref.go and pkg/api/v1/resource.go to subpackages. move some functions in resource.go to pkg/api/v1/node and pkg/api/v1/pod

2017-04-17 11:38:11 -07:00

kubelet_test.go

call GetHostIP from makeEnvironment

2017-03-28 20:20:21 -04:00

kubelet_volumes_test.go

Use the assert/require package in kubelet unit tests

2017-03-16 10:21:44 -07:00

kubelet_volumes.go

Make kubelet never delete files on mounted filesystems

2017-02-28 14:32:07 +01:00

kubelet.go

Registered node before other initialization.

2017-04-18 10:43:56 +08:00

networks.go

add portmapping getter into network host

2017-02-08 09:35:04 -08:00

oom_watcher_test.go

Use the assert/require package in kubelet unit tests

2017-03-16 10:21:44 -07:00

oom_watcher.go

switch kubelet to use external (client-go) object references for events

2017-01-31 19:15:33 -05:00

OWNERS

Small fix in kubelet owner file.

2017-01-19 11:04:57 -08:00

pod_container_deletor_test.go

…

pod_container_deletor.go

start the apimachinery repo

2017-01-11 09:09:48 -05:00

pod_workers_test.go

move client/record

2017-01-31 19:14:13 -05:00

pod_workers.go

increase timeout

2017-02-27 10:59:24 -08:00

reason_cache_test.go

start the apimachinery repo

2017-01-11 09:09:48 -05:00

reason_cache.go

start the apimachinery repo

2017-01-11 09:09:48 -05:00

runonce_test.go

Revert "Merge pull request #41202 from dashpole/revert-41095-deletion_pod_lifecycle"

2017-02-15 08:44:03 -08:00

runonce.go

cmd/kubelet

2016-11-23 15:53:09 -08:00

runtime.go

Check the health of PLEG when updating the node status

2017-01-10 16:34:00 -08:00

util.go

cmd/kubelet

2016-11-23 15:53:09 -08:00

volume_host.go

SecretVolume using secret manager

2017-01-23 16:10:01 +01:00