From a4ee5d31414ab4a356a621ad9be5ee091a029fc3 Mon Sep 17 00:00:00 2001
From: Evan Baker <rbtr@users.noreply.github.com>
Date: Thu, 15 Jul 2021 15:09:51 -0500
Subject: [PATCH] chore: update cns daemonset specs with new mounts

---
 cns/azure-cns.yaml                            | 17 +++++++++++++++--
 test/integration/manifests/cns/daemonset.yaml | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/cns/azure-cns.yaml b/cns/azure-cns.yaml
index 0b19eaccdb..2879f67feb 100644
--- a/cns/azure-cns.yaml
+++ b/cns/azure-cns.yaml
@@ -93,7 +93,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: cns-container
-          image: mcr.microsoft.com/containernetworking/azure-cns:v1.4.0
+          image: mcr.microsoft.com/containernetworking/azure-cns:v1.4.6
           imagePullPolicy: IfNotPresent
           args: [ "-c", "tcp://$(CNSIpAddress):$(CNSPort)", "-t", "$(CNSLogTarget)"]
           volumeMounts:
@@ -103,6 +103,10 @@ spec:
               mountPath: /var/lib/azure-network
             - name: cns-config
               mountPath: /etc/azure-cns
+            - name: azure-vnet
+              mountPath: /var/run/azure-vnet
+            - name: legacy-cni-state
+              mountPath: /var/run/azure-vnet.json
           ports:
             - containerPort: 10090
           env:
@@ -129,6 +133,14 @@ spec:
           hostPath:
             path: /var/lib/azure-network
             type: DirectoryOrCreate
+        - name: azure-vnet
+          hostPath:
+            path: /var/run/azure-vnet
+            type: DirectoryOrCreate
+        - name: legacy-cni-state
+          hostPath:
+            path: /var/run/azure-vnet.json
+            type: FileOrCreate
         - name: cns-config
           configMap:
             name: cns-config
@@ -157,5 +169,6 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
-      "ChannelMode": "CRD"
+      "ChannelMode": "CRD",
+      "InitializeFromCNI": true
     }
diff --git a/test/integration/manifests/cns/daemonset.yaml b/test/integration/manifests/cns/daemonset.yaml
index ed990549cd..df45e56f8e 100644
--- a/test/integration/manifests/cns/daemonset.yaml
+++ b/test/integration/manifests/cns/daemonset.yaml
@@ -51,6 +51,10 @@ spec:
               mountPath: /var/lib/azure-network
             - name: cns-config
               mountPath: /etc/azure-cns
+            - name: azure-vnet
+              mountPath: /var/run/azure-vnet
+            - name: legacy-cni-state
+              mountPath: /var/run/azure-vnet.json
           ports:
             - containerPort: 10090
           env:
@@ -77,6 +81,14 @@ spec:
           hostPath:
             path: /var/lib/azure-network
             type: DirectoryOrCreate
+        - name: azure-vnet
+          hostPath:
+            path: /var/run/azure-vnet
+            type: DirectoryOrCreate
+        - name: legacy-cni-state
+          hostPath:
+            path: /var/run/azure-vnet.json
+            type: FileOrCreate
         - name: cns-config
           configMap:
             name: cns-config
@@ -105,5 +117,6 @@ data:
           "NodeID": "",
           "NodeSyncIntervalInSeconds": 30
       },
-      "ChannelMode": "CRD"
+      "ChannelMode": "CRD",
+      "InitializeFromCNI": true
     }