ci: remove windows transparent vlan conflist (#3136)
This commit is contained in:
Родитель
42aea15a34
Коммит
2a6e215ffa
|
@ -27,7 +27,7 @@ WORKDIR /payload
|
|||
COPY --from=azure-vnet /go/bin/* /payload/
|
||||
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS.conflist /payload/azure.conflist
|
||||
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift.conflist /payload/azure-swift.conflist
|
||||
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-multitenancy-transparent-vlan.conflist /payload/azure-multitenancy-transparent-vlan.conflist
|
||||
COPY --from=azure-vnet /azure-container-networking/cni/azure-linux-multitenancy-transparent-vlan.conflist /payload/azure-multitenancy-transparent-vlan.conflist
|
||||
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay.conflist /payload/azure-swift-overlay.conflist
|
||||
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay-dualstack.conflist /payload/azure-swift-overlay-dualstack.conflist
|
||||
COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-multitenancy.conflist /payload/azure-multitenancy.conflist
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
{
|
||||
"cniVersion": "0.3.0",
|
||||
"name": "azure",
|
||||
"plugins": [
|
||||
{
|
||||
"type": "azure-vnet",
|
||||
"mode": "transparent-vlan",
|
||||
"bridge": "azure0",
|
||||
"multiTenancy":true,
|
||||
"enableSnatOnHost":true,
|
||||
"enableExactMatchForPodName": true,
|
||||
"capabilities": {
|
||||
"portMappings": true
|
||||
},
|
||||
"ipam": {
|
||||
"type": "azure-cns"
|
||||
},
|
||||
"dns": {
|
||||
"Nameservers": [
|
||||
"10.0.0.10",
|
||||
"168.63.129.16"
|
||||
],
|
||||
"Search": [
|
||||
"svc.cluster.local"
|
||||
]
|
||||
},
|
||||
"AdditionalArgs": [
|
||||
{
|
||||
"Name": "EndpointPolicy",
|
||||
"Value": {
|
||||
"Type": "OutBoundNAT",
|
||||
"ExceptionList": [
|
||||
"10.240.0.0/16",
|
||||
"10.0.0.0/8"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"Name": "EndpointPolicy",
|
||||
"Value": {
|
||||
"Type": "ROUTE",
|
||||
"DestinationPrefix": "10.0.0.0/8",
|
||||
"NeedEncap": true
|
||||
}
|
||||
}
|
||||
],
|
||||
"windowsSettings": {
|
||||
"hnsTimeoutDurationInSeconds" : 120
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
Загрузка…
Ссылка в новой задаче