From 0d7e72e43cb6da06eeca5ed2bc80365d5d37ce52 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 15 Oct 2017 14:29:58 -0400 Subject: [PATCH] kopeio-vxlan: mark critical, remove cpu limit --- .../cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml | 2 +- .../resources/addons/networking.kope.io/pre-k8s-1.6.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml b/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml index 687f27a90e..355988bfda 100644 --- a/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml +++ b/upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml @@ -14,6 +14,7 @@ spec: role.kubernetes.io/networking: "1" annotations: scheduler.alpha.kubernetes.io/critical-pod: '' + scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: hostPID: true hostIPC: true @@ -24,7 +25,6 @@ spec: cpu: 20m memory: 100Mi limits: - cpu: 20m memory: 100Mi securityContext: privileged: true diff --git a/upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml b/upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml index 1eb015049d..40718fa95f 100644 --- a/upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml +++ b/upup/models/cloudup/resources/addons/networking.kope.io/pre-k8s-1.6.yaml @@ -14,6 +14,7 @@ spec: role.kubernetes.io/networking: "1" annotations: scheduler.alpha.kubernetes.io/critical-pod: '' + scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' spec: hostPID: true hostIPC: true @@ -24,7 +25,6 @@ spec: cpu: 20m memory: 100Mi limits: - cpu: 20m memory: 100Mi securityContext: privileged: true