kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2010 from mihok/flannel-guarenteed 

Adding equal resource requests/limits to flannel for guarenteed QoS
This commit is contained in:
Justin Santa Barbara 2017-03-01 22:14:44 -05:00 committed by GitHub
parent be559a8da9 43a2848a07
commit b0254a4800
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
upup/models/cloudup/resources/addons/networking.flannel/v0.7.0.yaml
View File

@ -67,6 +67,13 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
resources:
limits:
cpu: 100m
memory: 100Mi
requests:
cpu: 100m
memory: 100Mi
volumeMounts: volumeMounts:
- name: run - name: run
mountPath: /run mountPath: /run
@ -75,6 +82,13 @@ spec:
- name: install-cni - name: install-cni
image: quay.io/coreos/flannel:v0.7.0 image: quay.io/coreos/flannel:v0.7.0
command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ] command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ]
resources:
limits:
cpu: 10m
memory: 25Mi
requests:
cpu: 10m
memory: 25Mi
volumeMounts: volumeMounts:
- name: cni - name: cni
mountPath: /etc/cni/net.d mountPath: /etc/cni/net.d