Skip to content

Commit 3fc8e90

Browse files
committed
feat: chained conflist
1 parent 93d32ac commit 3fc8e90

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

cni/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ COPY --from=azure-vnet /azure-container-networking/cni/azure-linux-multitenancy-
3333
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay.conflist /payload/azure-swift-overlay.conflist
3434
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay-dualstack.conflist /payload/azure-swift-overlay-dualstack.conflist
3535
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-multitenancy.conflist /payload/azure-multitenancy.conflist
36+
COPY --from=azure-vnet /azure-container-networking/cni/azure-chained-cilium.conflist /payload/azure-chained-cilium.conflist
3637
COPY --from=azure-vnet /azure-container-networking/telemetry/azure-vnet-telemetry.config /payload/azure-vnet-telemetry.config
3738
RUN cd /payload && sha256sum * > sum.txt
3839
RUN gzip --verbose --best --recursive /payload && for f in /payload/*.gz; do mv -- "$f" "${f%%.gz}"; done

cni/azure-chained-cilium.conflist

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"cniVersion": "0.3.0",
3+
"name": "azure",
4+
"plugins": [
5+
{
6+
"type": "azure-vnet",
7+
"mode": "transparent",
8+
"ipsToRouteViaHost": [
9+
"169.254.20.10"
10+
],
11+
"executionMode": "v4swift",
12+
"ipam": {
13+
"type": "azure-cns"
14+
}
15+
},
16+
{
17+
"name": "cilium",
18+
"type": "cilium-cni"
19+
}
20+
]
21+
}

0 commit comments

Comments
 (0)