Skip to content

Commit bb67582

Browse files
authored
Update Makefile to build all binaries (#1575)
* build azure-ipam and zapai * build ipam for linux only * add archives * remove zapai build * update azure-ipam archive * test
1 parent 088e213 commit bb67582

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CNS_DIR = $(REPO_ROOT)/cns/service
5353
NPM_DIR = $(REPO_ROOT)/npm/cmd
5454
OUTPUT_DIR = $(REPO_ROOT)/output
5555
BUILD_DIR = $(OUTPUT_DIR)/$(GOOS)_$(GOARCH)
56-
AUZRE_IPAM_BUILD_DIR = $(BUILD_DIR)/azure-ipam
56+
AZURE_IPAM_BUILD_DIR = $(BUILD_DIR)/azure-ipam
5757
IMAGE_DIR = $(OUTPUT_DIR)/images
5858
CNM_BUILD_DIR = $(BUILD_DIR)/cnm
5959
CNI_BUILD_DIR = $(BUILD_DIR)/cni
@@ -95,6 +95,7 @@ CNI_BAREMETAL_ARCHIVE_NAME = azure-vnet-cni-baremetal-$(GOOS)-$(GOARCH)-$(CNI_VE
9595
CNM_ARCHIVE_NAME = azure-vnet-cnm-$(GOOS)-$(GOARCH)-$(ACN_VERSION).$(ARCHIVE_EXT)
9696
CNS_ARCHIVE_NAME = azure-cns-$(GOOS)-$(GOARCH)-$(CNS_VERSION).$(ARCHIVE_EXT)
9797
NPM_ARCHIVE_NAME = azure-npm-$(GOOS)-$(GOARCH)-$(NPM_VERSION).$(ARCHIVE_EXT)
98+
AZURE_IPAM_ARCHIVE_NAME = azure-ipam-$(GOOS)-$(GOARCH)-$(AZURE_IPAM_VERSION).$(ARCHIVE_EXT)
9899

99100
# Image info file names.
100101
CNI_DROPGZ_IMAGE_INFO_FILE = cni-dropgz-$(CNI_DROPGZ_VERSION).txt
@@ -115,7 +116,7 @@ all-binaries-platforms: ## Make all platform binaries
115116

116117
# OS specific binaries/images
117118
ifeq ($(GOOS),linux)
118-
all-binaries: acncli azure-cnm-plugin azure-cni-plugin azure-cns azure-npm
119+
all-binaries: acncli azure-cnm-plugin azure-cni-plugin azure-cns azure-npm azure-ipam
119120
all-images: npm-image cns-image cni-manager-image
120121
else
121122
all-binaries: azure-cnm-plugin azure-cni-plugin azure-cns azure-npm
@@ -130,6 +131,7 @@ azure-cns: azure-cns-binary cns-archive
130131
acncli: acncli-binary acncli-archive
131132
azure-cnms: azure-cnms-binary cnms-archive
132133
azure-npm: azure-npm-binary npm-archive
134+
azure-ipam: azure-ipam-binary azure-ipam-archive
133135

134136

135137
##@ Versioning
@@ -164,7 +166,7 @@ zapai-version: ## prints the zapai version
164166

165167
# Build the delegated IPAM plugin binary.
166168
azure-ipam-binary:
167-
cd $(AZURE_IPAM_DIR) && CGO_ENABLED=0 go build -v -o $(AUZRE_IPAM_BUILD_DIR)/azure-ipam$(EXE_EXT) -ldflags "-X main.version=$(AZURE_IPAM_VERSION)" -gcflags="-dwarflocationlists=true"
169+
cd $(AZURE_IPAM_DIR) && CGO_ENABLED=0 go build -v -o $(AZURE_IPAM_BUILD_DIR)/azure-ipam$(EXE_EXT) -ldflags "-X main.version=$(AZURE_IPAM_VERSION)" -gcflags="-dwarflocationlists=true"
168170

169171
# Build the Azure CNM binary.
170172
cnm-binary:
@@ -199,7 +201,6 @@ azure-npm-binary:
199201
cd $(CNI_TELEMETRY_DIR) && CGO_ENABLED=0 go build -v -o $(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(NPM_VERSION)" -gcflags="-dwarflocationlists=true"
200202
cd $(NPM_DIR) && CGO_ENABLED=0 go build -v -o $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(NPM_VERSION) -X $(NPM_AI_PATH)=$(NPM_AI_ID)" -gcflags="-dwarflocationlists=true"
201203

202-
203204
##@ Containers
204205

205206
## Common variables for all containers.
@@ -586,6 +587,14 @@ ifeq ($(GOOS),linux)
586587
cd $(NPM_BUILD_DIR) && $(ARCHIVE_CMD) $(NPM_ARCHIVE_NAME) azure-npm$(EXE_EXT)
587588
endif
588589

590+
# Create a azure-ipam archive for the target platform.
591+
.PHONY: azure-ipam-archive
592+
azure-ipam-archive: azure-ipam-binary
593+
ifeq ($(GOOS),linux)
594+
$(MKDIR) $(AZURE_IPAM_BUILD_DIR)
595+
cd $(AZURE_IPAM_BUILD_DIR) && $(ARCHIVE_CMD) $(AZURE_IPAM_ARCHIVE_NAME) azure-ipam$(EXE_EXT)
596+
endif
597+
589598

590599
##@ Utils
591600

0 commit comments

Comments
 (0)