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

Merge pull request #3632 from justinsb/kopeio_cricial 

Automatic merge from submit-queue.

kopeio-vxlan: mark critical, remove cpu limit
This commit is contained in:
Kubernetes Submit Queue 2017-10-15 14:44:57 -07:00 committed by GitHub
parent 2c5da715a2 0d7e72e43c
commit 2c2f9fd6cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml
View File

@ -14,6 +14,7 @@ spec:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
hostPID: true hostPID: true
hostIPC: true hostIPC: true
@ -24,7 +25,6 @@ spec:
cpu: 20m cpu: 20m
memory: 100Mi memory: 100Mi
limits: limits:
cpu: 20m
memory: 100Mi memory: 100Mi
securityContext: securityContext:
privileged: true privileged: true

2
upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml
View File

@ -14,6 +14,7 @@ spec:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
hostPID: true hostPID: true
hostIPC: true hostIPC: true
@ -24,7 +25,6 @@ spec:
cpu: 20m cpu: 20m
memory: 100Mi memory: 100Mi
limits: limits:
cpu: 20m
memory: 100Mi memory: 100Mi
securityContext: securityContext:
privileged: true privileged: true