Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions cns/azure-cns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -157,5 +169,6 @@ data:
"NodeID": "",
"NodeSyncIntervalInSeconds": 30
},
"ChannelMode": "CRD"
"ChannelMode": "CRD",
"InitializeFromCNI": true
}
15 changes: 14 additions & 1 deletion test/integration/manifests/cns/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -105,5 +117,6 @@ data:
"NodeID": "",
"NodeSyncIntervalInSeconds": 30
},
"ChannelMode": "CRD"
"ChannelMode": "CRD",
"InitializeFromCNI": true
}