From: Balazs Szekeres <balazs.szekeres@nokia.com>
Date: Mon, 30 Sep 2019 15:26:08 +0000 (+0200)
Subject: Kubernetes 1.16.0 node label fix
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=commitdiff_plain;h=d93171dfb987e103f84149d6b54d9350a078bf9e

Kubernetes 1.16.0 node label fix

Change-Id: I0d2b229db575bb2257b983c2978cff56620e575e
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>
---

diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec
index 12ca7f0..d3de5a8 100644
--- a/SPECS/caas-flannel.spec
+++ b/SPECS/caas-flannel.spec
@@ -15,7 +15,7 @@
 %define COMPONENT flannel
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 0.11.0
-%define RPM_MINOR_VERSION 6
+%define RPM_MINOR_VERSION 7
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}
diff --git a/ansible/roles/flannel/templates/flannel-ds.yaml b/ansible/roles/flannel/templates/flannel-ds.yaml
index eb0c571..e50f855 100644
--- a/ansible/roles/flannel/templates/flannel-ds.yaml
+++ b/ansible/roles/flannel/templates/flannel-ds.yaml
@@ -39,7 +39,7 @@ spec:
      #securityContext:
      #     runAsUser: {{ caas.uid.flannel }}
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node.kubernetes.io/master
         operator: Exists
         effect: NoSchedule
       containers: