Skip to content

Commit 0ddedd8

Browse files
saiyan86sharmasushant
authored andcommitted
separate conflist for Windows & Linux (#94)
1 parent c97b593 commit 0ddedd8

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ publish-azure-vnet-plugin-image:
151151
# Create a CNI archive for the target platform.
152152
.PHONY: cni-archive
153153
cni-archive:
154-
cp cni/azure.conflist $(CNI_BUILD_DIR)/10-azure.conflist
154+
cp cni/azure-$(GOOS).conflist $(CNI_BUILD_DIR)/10-azure-$(GOOS).conflist
155155
chmod 0755 $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT)
156156
cd $(CNI_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) 10-azure.conflist
157157
chown $(BUILD_USER):$(BUILD_USER) $(CNI_BUILD_DIR)/$(CNI_ARCHIVE_NAME)
File renamed without changes.

cni/azure-windows.conflist

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"cniVersion": "0.3.0",
3+
"name": "azure",
4+
"plugins": [{
5+
"type": "azure-vnet",
6+
"mode": "bridge",
7+
"bridge": "azure0",
8+
"ipam": {
9+
"type": "azure-vnet-ipam"
10+
}
11+
}
12+
]
13+
}

0 commit comments

Comments
 (0)