Merge pull request #13817 from a-robinson/varlib

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-10 13:24:07 -07:00
commit c0d0ef6dd1
3 changed files with 3 additions and 1 deletions

View File

@ -11,7 +11,7 @@ spec:
limits:
cpu: 100m
args:
- -qq
- -q
volumeMounts:
- name: varlog
mountPath: /var/log

View File

@ -19,6 +19,7 @@ spec:
mountPath: /varlog
- name: containers
mountPath: /var/lib/docker/containers
readOnly: true
terminationGracePeriodSeconds: 30
volumes:
- name: varlog

View File

@ -182,6 +182,7 @@ spec:
mountPath: /varlog
- name: containers
mountPath: /var/lib/docker/containers
readOnly: true
terminationGracePeriodSeconds: 30
volumes:
- name: varlog