Commit Graph

25278 Commits

Author SHA1 Message Date
Andy Goldstein
51251ef5c1 Skip probe if container ID not yet set
If the container status exists but the container hasn't been created yet, it won't have an ID.
Have the probe wait for a valid status if the container ID is not yet set; otherwise, you'll see the
following cryptic log message from runtime.go: invalid container ID: "".
2016-02-23 15:32:13 -05:00
k8s-merge-robot
f5082b6dd7 Merge pull request #21768 from mesosphere/jdef_fix_scheduler_ha_787
Auto commit by PR queue bot
2016-02-23 11:11:41 -08:00
k8s-merge-robot
6c8ce0e417 Merge pull request #21393 from erictune/fix-swagger-gen-1
Auto commit by PR queue bot
2016-02-23 11:11:40 -08:00
k8s-merge-robot
6332d84039 Merge pull request #19782 from pmorie/config-docs
Auto commit by PR queue bot
2016-02-23 11:11:36 -08:00
Joe Finney
178a8835d2 Merge pull request #21704 from spxtr/finish-yaml-refactor
Finish yaml refactor
2016-02-23 11:10:44 -08:00
Paul Morie
7e64b4ac52 Add ConfigMap docs 2016-02-23 13:27:54 -05:00
k8s-merge-robot
cdbbeae3e5 Merge pull request #21486 from fgrzadkowski/docker_ubuntu_fix
Auto commit by PR queue bot
2016-02-23 09:48:50 -08:00
James DeFelice
250a511a78 fix k8sm-787 scheduler failover regression 2016-02-23 17:43:00 +00:00
k8s-merge-robot
d0ce85a6d1 Merge pull request #21687 from kargakis/generation-updates-for-label-annotation-changes
Auto commit by PR queue bot
2016-02-23 07:51:48 -08:00
k8s-merge-robot
58783bc256 Merge pull request #21684 from justinsb/fix_21200
Auto commit by PR queue bot
2016-02-23 07:06:08 -08:00
k8s-merge-robot
7f1b699880 Merge pull request #21071 from soltysh/server_close
Auto commit by PR queue bot
2016-02-23 06:34:27 -08:00
k8s-merge-robot
a89b607a9c Merge pull request #21666 from wojtek-t/registry_options
Auto commit by PR queue bot
2016-02-23 05:54:47 -08:00
k8s-merge-robot
725a8e8b36 Merge pull request #21369 from AdoHe/kubectl_change_column_titles
Auto commit by PR queue bot
2016-02-23 05:20:38 -08:00
k8s-merge-robot
d3661414a1 Merge pull request #21273 from kargakis/rolling-updater-fix
Auto commit by PR queue bot
2016-02-23 04:50:59 -08:00
k8s-merge-robot
aa9e139894 Merge pull request #21726 from janetkuo/log-on-timeout
Auto commit by PR queue bot
2016-02-23 04:16:49 -08:00
k8s-merge-robot
9470a7e61c Merge pull request #21627 from justinsb/fix_11324
Auto commit by PR queue bot
2016-02-23 03:45:10 -08:00
k8s-merge-robot
6b649d7f9f Merge pull request #21706 from liggitt/token-controller
Auto commit by PR queue bot
2016-02-23 02:40:26 -08:00
k8s-merge-robot
ac644e03bd Merge pull request #20769 from bprashanth/ing_config
Auto commit by PR queue bot
2016-02-23 02:09:15 -08:00
kargakis
69cd75c6a8 registry: remove todos about rc/rs label/annotation updates 2016-02-23 10:24:02 +01:00
k8s-merge-robot
b034050f6a Merge pull request #21725 from spxtr/remove-e2e-from-release
Auto commit by PR queue bot
2016-02-23 00:49:32 -08:00
k8s-merge-robot
84e5cabdf7 Merge pull request #21642 from mitake/remove-kube-dump
Auto commit by PR queue bot
2016-02-23 00:49:31 -08:00
k8s-merge-robot
be623ae3fa Merge pull request #18562 from fgimenez/added-missing-juju-dependency-to-doc
Auto commit by PR queue bot
2016-02-23 00:49:29 -08:00
k8s-merge-robot
3a12b03710 Merge pull request #21448 from timstclair/worker-race
Auto commit by PR queue bot
2016-02-23 00:49:28 -08:00
k8s-merge-robot
599af17e0d Merge pull request #21685 from gmarek/resource-usage
Auto commit by PR queue bot
2016-02-23 00:16:21 -08:00
k8s-merge-robot
2acae62709 Merge pull request #21683 from justinsb/fix_20912
Auto commit by PR queue bot
2016-02-22 23:45:45 -08:00
k8s-merge-robot
5d4007f2fa Merge pull request #21644 from thibserot/dns2
Auto commit by PR queue bot
2016-02-22 23:45:44 -08:00
k8s-merge-robot
0afbc71f31 Merge pull request #21030 from janetkuo/deployment-label-adopted
Auto commit by PR queue bot
2016-02-22 23:45:42 -08:00
Brian Grant
7662a5ee54 Merge pull request #21734 from janetkuo/rollover-flake
Wait for pods to become available before rolling over in deployment e2e test
2016-02-22 20:15:33 -08:00
Janet Kuo
ecce9492cc Wait for pods to become available before rolling over in deployment e2e test 2016-02-22 18:36:39 -08:00
Brian Grant
f4de3ea676 Merge pull request #21710 from janetkuo/flake-event-order
Don't rely on events in deployment rollback e2e test
2016-02-22 17:54:07 -08:00
Prashanth B
c833a14898 Merge pull request #21727 from dchen1107/test
Remove potential corrupted docker network checkpoint file before star…
2016-02-22 17:52:16 -08:00
Janet Kuo
4369a21969 Log deployment, RSes and pods on waitForDeploymentStatus timeout / condition mismatch 2016-02-22 17:29:44 -08:00
Dawn Chen
d922ddef8c Remove potential corrupted docker network checkpoint file before start docker
again.
2016-02-22 17:08:31 -08:00
Joe Finney
454cec71e8 Remove hack/e2e-from-release.sh. 2016-02-22 16:45:29 -08:00
Brian Grant
6cecf2b357 Merge pull request #21715 from janetkuo/remove-racy-check
Remove racy check in waitForDeploymentStatus; wait for underlying resources to reach the desired state instead
2016-02-22 16:22:14 -08:00
k8s-merge-robot
be68276db0 Merge pull request #21708 from spxtr/fix-trusty
Auto commit by PR queue bot
2016-02-22 16:16:54 -08:00
k8s-merge-robot
789fd731d2 Merge pull request #21686 from justinsb/aws_kubeup_build_config_early
Auto commit by PR queue bot
2016-02-22 16:16:53 -08:00
k8s-merge-robot
8afccef608 Merge pull request #21632 from justinsb/docker_191
Auto commit by PR queue bot
2016-02-22 16:16:51 -08:00
Dawn Chen
84e5ea9940 Merge pull request #21518 from jlowdermilk/node-labels
Plumb node labels through salt
2016-02-22 16:11:01 -08:00
Jeff Lowdermilk
c406665b2b Plumb node labels through salt
Expose node-labels flag on kubelet for gce via a startup script
env var.
2016-02-22 15:31:34 -08:00
Joe Finney
892c8e5153 Comment upgrade YAML. 2016-02-22 15:16:56 -08:00
Dawn Chen
699c80b752 Merge pull request #21641 from bprashanth/promisc
Teach the kubelet about promiscuous mode, take 2
2016-02-22 15:08:18 -08:00
Dawn Chen
201d60b426 Merge pull request #21440 from bprashanth/glbc_name
Add image version to glbc name.
2016-02-22 14:48:48 -08:00
Janet Kuo
d2c9d51999 Remove racy check in waitForDeploymentStatus; wait for underlying resources to reach the desired state instead 2016-02-22 14:47:38 -08:00
Dawn Chen
1e680c9d94 Merge pull request #21158 from kubernetes/milestone-doc
Add milestone tag clarifications
2016-02-22 14:11:45 -08:00
k8s-merge-robot
fb2a209ed7 Merge pull request #21221 from yifan-gu/rkt_doc
Auto commit by PR queue bot
2016-02-22 14:02:54 -08:00
Janet Kuo
eaa4eb10aa Don't rely on events in deployment rollback e2e test 2016-02-22 13:51:51 -08:00
Dawn Chen
b58826292a Merge pull request #21703 from dchen1107/test
Make sure docker is properly shutdown before startup.
2016-02-22 13:35:24 -08:00
Joe Finney
1dea4052b9 Properly set runner for trusty gce jobs. 2016-02-22 13:30:49 -08:00
Jordan Liggitt
92bf353496 Ensure created service account tokens are available to the token controller 2016-02-22 16:22:51 -05:00