kubernetes

Files

k8s-merge-robot 61f383e5d1 Merge pull request #23785 from ajohnstone/23784-aws-vpc-key-error

Automatic merge from submit-queue

AWS kube-down: don't fail if ELB not in VPC - #23784

Prevent python undefined key error.

```
Traceback (most recent call last):
  File "<string>", line 1, in <module>
KeyError: 'VPCId'
```

Fixes #23784

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/23785)
<!-- Reviewable:end -->

2016-05-16 01:45:49 -07:00

coreos

fix for https://github.com/kubernetes/kubernetes/issues/13511

2016-03-25 22:29:09 +08:00

jessie

AWS kube-up: Bump jessie image

2016-03-16 07:51:41 -04:00

templates

AWS: Don't error if there are no ephemeral disks

2016-04-01 22:27:20 -04:00

trusty

AWS: Pass non-masquerade-cidr through kube-up