Skip to content

Commit 87e4f91

Browse files
authored
chore: update cns daemonset specs with new mounts (#936)
1 parent 8bf1a24 commit 87e4f91

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

cns/azure-cns.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ spec:
9393
effect: NoSchedule
9494
containers:
9595
- name: cns-container
96-
image: mcr.microsoft.com/containernetworking/azure-cns:v1.4.0
96+
image: mcr.microsoft.com/containernetworking/azure-cns:v1.4.6
9797
imagePullPolicy: IfNotPresent
9898
args: [ "-c", "tcp://$(CNSIpAddress):$(CNSPort)", "-t", "$(CNSLogTarget)"]
9999
volumeMounts:
@@ -103,6 +103,10 @@ spec:
103103
mountPath: /var/lib/azure-network
104104
- name: cns-config
105105
mountPath: /etc/azure-cns
106+
- name: azure-vnet
107+
mountPath: /var/run/azure-vnet
108+
- name: legacy-cni-state
109+
mountPath: /var/run/azure-vnet.json
106110
ports:
107111
- containerPort: 10090
108112
env:
@@ -129,6 +133,14 @@ spec:
129133
hostPath:
130134
path: /var/lib/azure-network
131135
type: DirectoryOrCreate
136+
- name: azure-vnet
137+
hostPath:
138+
path: /var/run/azure-vnet
139+
type: DirectoryOrCreate
140+
- name: legacy-cni-state
141+
hostPath:
142+
path: /var/run/azure-vnet.json
143+
type: FileOrCreate
132144
- name: cns-config
133145
configMap:
134146
name: cns-config
@@ -157,5 +169,6 @@ data:
157169
"NodeID": "",
158170
"NodeSyncIntervalInSeconds": 30
159171
},
160-
"ChannelMode": "CRD"
172+
"ChannelMode": "CRD",
173+
"InitializeFromCNI": true
161174
}

test/integration/manifests/cns/daemonset.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ spec:
5151
mountPath: /var/lib/azure-network
5252
- name: cns-config
5353
mountPath: /etc/azure-cns
54+
- name: azure-vnet
55+
mountPath: /var/run/azure-vnet
56+
- name: legacy-cni-state
57+
mountPath: /var/run/azure-vnet.json
5458
ports:
5559
- containerPort: 10090
5660
env:
@@ -77,6 +81,14 @@ spec:
7781
hostPath:
7882
path: /var/lib/azure-network
7983
type: DirectoryOrCreate
84+
- name: azure-vnet
85+
hostPath:
86+
path: /var/run/azure-vnet
87+
type: DirectoryOrCreate
88+
- name: legacy-cni-state
89+
hostPath:
90+
path: /var/run/azure-vnet.json
91+
type: FileOrCreate
8092
- name: cns-config
8193
configMap:
8294
name: cns-config
@@ -105,5 +117,6 @@ data:
105117
"NodeID": "",
106118
"NodeSyncIntervalInSeconds": 30
107119
},
108-
"ChannelMode": "CRD"
120+
"ChannelMode": "CRD",
121+
"InitializeFromCNI": true
109122
}

0 commit comments

Comments
 (0)