daemonset: Critical pod, toleration, and standardization improvements (…

…#56) * Standardize k8s-app=kube-router label * Add tolerations to run on master/critical-only nodes * Add critical pod annotation
cloudnativelabs · Jul 13, 2017 · dca10e9 · dca10e9
1 parent 37d4192
commit dca10e9
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 13 deletions.
diff --git a/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml b/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml
@@ -4,18 +4,19 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
-        args: 
+        args:
           - "--run-router=true"
           - "--run-firewall=true"
           - "--run-service-proxy=true"
@@ -39,6 +40,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath:

diff --git a/daemonset/kube-router-all-service-daemonset.yaml b/daemonset/kube-router-all-service-daemonset.yaml
@@ -4,14 +4,15 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
@@ -32,6 +33,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath:

diff --git a/daemonset/kube-router-firewall-daemonset.yaml b/daemonset/kube-router-firewall-daemonset.yaml
@@ -4,14 +4,15 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
@@ -32,6 +33,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath:

diff --git a/daemonset/kube-router-proxy--daemonset.yaml → daemonset/kube-router-proxy-daemonset.yaml b/daemonset/kube-router-proxy--daemonset.yaml → daemonset/kube-router-proxy-daemonset.yaml
@@ -4,14 +4,15 @@ metadata:
   name: kube-router
   namespace: kube-system
   labels:
-    app: kube-router
+    k8s-app: kube-router
 spec:
   template:
     metadata:
       labels:
-        name: kube-router
+        k8s-app: kube-router
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      hostNetwork: true
       containers:
       - name: kube-router
         image: cloudnativelabs/kube-router
@@ -32,6 +33,13 @@ spec:
             name: cni-conf-dir
           - mountPath: /var/lib/kube-router/kubeconfig
             name: kubeconfig
+      hostNetwork: true
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath: