From 3685419042aa3bc65e3c384df61ed5e3e97da9f0 Mon Sep 17 00:00:00 2001
From: "Egorov, Stanislav (se6518)" <segorov@mirantis.com>
Date: Thu, 25 Apr 2019 14:22:06 -0700
Subject: [PATCH] Fixed for hyperkube 1.12

During bootstrap process kubernetes node is not ready due to missed CNI.
It will be installed later but for a few daemonsets it's critical.
They can't start pods and looping in a while.

Workaround is here: add tolerations.

Change-Id: Ib3c361949ea4e452d599aa7a3a2b7827541b7bac
---
 charts/etcd/templates/daemonset-anchor.yaml       | 3 +++
 charts/etcd/templates/tests/test-etcd-health.yaml | 3 +++
 charts/proxy/templates/daemonset.yaml             | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/charts/etcd/templates/daemonset-anchor.yaml b/charts/etcd/templates/daemonset-anchor.yaml
index a3f865aa..0c9778e9 100644
--- a/charts/etcd/templates/daemonset-anchor.yaml
+++ b/charts/etcd/templates/daemonset-anchor.yaml
@@ -54,6 +54,9 @@ spec:
           effect: NoSchedule
         - key: CriticalAddonsOnly
           operator: Exists
+        - key: node.kubernetes.io/not-ready
+          operator: Exists
+          effect: NoSchedule
       terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.daemonset_anchor.timeout }}
       containers:
         - name: etcdctl
diff --git a/charts/etcd/templates/tests/test-etcd-health.yaml b/charts/etcd/templates/tests/test-etcd-health.yaml
index 070959e9..bd76fd59 100644
--- a/charts/etcd/templates/tests/test-etcd-health.yaml
+++ b/charts/etcd/templates/tests/test-etcd-health.yaml
@@ -52,6 +52,9 @@ spec:
     - key: node.kubernetes.io/network-unavailable
       effect: NoSchedule
       operator: Exists
+    - key: node.kubernetes.io/not-ready
+      operator: Exists
+      effect: NoSchedule
   containers:
     - name: "{{ .Release.Name }}-etcd-test"
       env:
diff --git a/charts/proxy/templates/daemonset.yaml b/charts/proxy/templates/daemonset.yaml
index 47fa9464..f5af0de3 100644
--- a/charts/proxy/templates/daemonset.yaml
+++ b/charts/proxy/templates/daemonset.yaml
@@ -46,6 +46,9 @@ spec:
           effect: NoSchedule
         - key: CriticalAddonsOnly
           operator: Exists
+        - key: node.kubernetes.io/not-ready
+          operator: Exists
+          effect: NoSchedule
       containers:
       - name: proxy
         image: {{ .Values.images.tags.proxy }}