Merge pull request #21504 from luxas/fix_certs_for_hyperkube

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-26 06:53:29 -08:00
8 changed files with 78 additions and 61 deletions

View File

@@ -21,7 +21,7 @@ spec:
spec:
containers:
- name: etcd
image: gcr.io/google_containers/etcd:2.0.9
image: gcr.io/google_containers/etcd-amd64:2.2.1
resources:
# keep request = limit to keep this container in guaranteed class
limits: