X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fflannel%2Ftemplates%2Fflannel-ds.yaml;h=e968fe9c6554c0b201d4ec4dea38596fb8a8bc87;hb=77284be6364a55804a63299e362e80051e7c35eb;hp=e50f855cb5089b0bacd6fe42ea5250cbf5b67c97;hpb=d93171dfb987e103f84149d6b54d9350a078bf9e;p=ta%2Fcaas-danm.git

diff --git a/ansible/roles/flannel/templates/flannel-ds.yaml b/ansible/roles/flannel/templates/flannel-ds.yaml
index e50f855..e968fe9 100644
--- a/ansible/roles/flannel/templates/flannel-ds.yaml
+++ b/ansible/roles/flannel/templates/flannel-ds.yaml
@@ -1,3 +1,4 @@
+#jinja2: lstrip_blocks: True
 {#
 Copyright 2019 Nokia
 
@@ -14,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: flannel-ds
@@ -42,6 +43,10 @@ spec:
       - key: node.kubernetes.io/master
         operator: Exists
         effect: NoSchedule
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       containers:
       - name: kube-flannel
         image: {{ container_image_names | select('search', '/flannel') | list | last }}
@@ -50,7 +55,9 @@ spec:
         args:
         - --ip-masq
         - --kube-subnet-mgr
-        - --iface={{ networking.infra_internal.interface }}
+        {% for interface in flannel_interfaces | default([]) %}
+        - --iface={{ interface }}
+        {% endfor %}
         securityContext:
           privileged: true
         env: