Skip to content

Commit f9c7cd2

Browse files
tamilmani1989sharmasushant
authored andcommitted
Create package for cni that supports multitenancy (#191)
1 parent 948a206 commit f9c7cd2

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CNIFILES = \
2828

2929
CNSFILES = \
3030
$(wildcard cns/*.go) \
31+
$(wildcard cns/cnsclient/*.go) \
3132
$(wildcard cns/common/*.go) \
3233
$(wildcard cns/dockerclient/*.go) \
3334
$(wildcard cns/imdsclient/*.go) \
@@ -51,6 +52,7 @@ OUTPUT_DIR = output
5152
BUILD_DIR = $(OUTPUT_DIR)/$(GOOS)_$(GOARCH)
5253
CNM_BUILD_DIR = $(BUILD_DIR)/cnm
5354
CNI_BUILD_DIR = $(BUILD_DIR)/cni
55+
CNI_MULTITENANCY_BUILD_DIR = $(BUILD_DIR)/cni-multitenancy
5456
CNS_BUILD_DIR = $(BUILD_DIR)/cns
5557

5658
# Containerized build parameters.
@@ -74,6 +76,7 @@ endif
7476
# Archive file names.
7577
CNM_ARCHIVE_NAME = azure-vnet-cnm-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
7678
CNI_ARCHIVE_NAME = azure-vnet-cni-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
79+
CNI_MULTITENANCY_ARCHIVE_NAME = azure-vnet-cni-multitenancy-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
7780
CNS_ARCHIVE_NAME = azure-cns-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
7881

7982
# Docker libnetwork (CNM) plugin v2 image parameters.
@@ -175,6 +178,12 @@ cni-archive:
175178
chmod 0755 $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT)
176179
cd $(CNI_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) 10-azure.conflist
177180
chown $(BUILD_USER):$(BUILD_USER) $(CNI_BUILD_DIR)/$(CNI_ARCHIVE_NAME)
181+
mkdir -p $(CNI_MULTITENANCY_BUILD_DIR)
182+
cp cni/azure-$(GOOS)-multitenancy.conflist $(CNI_MULTITENANCY_BUILD_DIR)/10-azure.conflist
183+
cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) $(CNI_MULTITENANCY_BUILD_DIR)
184+
chmod 0755 $(CNI_MULTITENANCY_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_MULTITENANCY_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT)
185+
cd $(CNI_MULTITENANCY_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_MULTITENANCY_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) 10-azure.conflist
186+
chown $(BUILD_USER):$(BUILD_USER) $(CNI_MULTITENANCY_BUILD_DIR)/$(CNI_MULTITENANCY_ARCHIVE_NAME)
178187

179188
# Create a CNM archive for the target platform.
180189
.PHONY: cnm-archive

0 commit comments

Comments
 (0)