modules/bootkube: remove critical pod annotation

Remove the critical pod annotation and toleration from the controller-manager and scheduler, since this can result in dangerous behavior as discussed in kubernetes-retired/bootkube#519.
squat · Aug 16, 2017 · 91f82f1 · 91f82f1
1 parent 4ff6169
commit 91f82f1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/modules/bootkube/resources/manifests/kube-controller-manager.yaml b/modules/bootkube/resources/manifests/kube-controller-manager.yaml
@@ -18,8 +18,6 @@ spec:
         tier: control-plane
         k8s-app: kube-controller-manager
         pod-anti-affinity: kube-controller-manager-${kubernetes_version}
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
     spec:
       affinity:
         podAntiAffinity:
@@ -73,8 +71,6 @@ spec:
           pod-anti-affinity: kube-controller-manager-${kubernetes_version}
           tier: control-plane
       tolerations:
-      - key: "CriticalAddonsOnly"
-        operator: "Exists"
       - key: "node-role.kubernetes.io/master"
         operator: "Exists"
         effect: "NoSchedule"

diff --git a/modules/bootkube/resources/manifests/kube-scheduler.yaml b/modules/bootkube/resources/manifests/kube-scheduler.yaml
@@ -18,8 +18,6 @@ spec:
         tier: control-plane
         k8s-app: kube-scheduler
         pod-anti-affinity: kube-scheduler-${kubernetes_version}
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
     spec:
       affinity:
         podAntiAffinity:
@@ -54,8 +52,6 @@ spec:
           pod-anti-affinity: kube-scheduler-${kubernetes_version}
           tier: control-plane
       tolerations:
-      - key: "CriticalAddonsOnly"
-        operator: "Exists"
       - key: "node-role.kubernetes.io/master"
         operator: "Exists"
         effect: "NoSchedule"