Merge pull request #3638 from bboreham/weave-critical

Automatic merge from submit-queue. Weave Net: add critical-pod annotation and toleration for rescheduler Fixes #3420 Background at https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
kubernetes · Oct 16, 2017 · 3c01e26 · 3c01e26
2 parents 2c2f9fd + e2357f8
commit 3c01e26
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template
@@ -64,6 +64,8 @@ spec:
       labels:
         name: weave-net
         role.kubernetes.io/networking: "1"
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
         - name: weave
@@ -136,6 +138,8 @@ spec:
       tolerations:
         - effect: NoSchedule
           operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
       volumes:
         - name: weavedb
           hostPath:

diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template
@@ -64,6 +64,8 @@ spec:
       labels:
         name: weave-net
         role.kubernetes.io/networking: "1"
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
         - name: weave
@@ -141,6 +143,8 @@ spec:
       tolerations:
         - effect: NoSchedule
           operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
       volumes:
         - name: weavedb
           hostPath:

diff --git a/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template
@@ -19,8 +19,9 @@ spec:
   template:
     metadata:
       annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: >-
-          [{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]
+          [{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"},{"key":"CriticalAddonsOnly", "operator":"Exists"}]
       labels:
         name: weave-net
         role.kubernetes.io/networking: "1"