Skip to content

Commit 27993bb

Browse files
authored
fix: remove unsupported targets when building all binaries (#2591)
* Remove cnm and windows transparent vlan targets when building all binaries * Remove azure ipam from transparent vlan build
1 parent 2a6be77 commit 27993bb

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ all-binaries-platforms: ## Make all platform binaries
120120

121121
# OS specific binaries/images
122122
ifeq ($(GOOS),linux)
123-
all-binaries: acncli azure-cnm-plugin azure-cni-plugin azure-cns azure-npm azure-ipam
123+
all-binaries: acncli azure-cni-plugin azure-cns azure-npm azure-ipam
124124
all-images: npm-image cns-image cni-manager-image
125125
else
126-
all-binaries: azure-cnm-plugin azure-cni-plugin azure-cns azure-npm
126+
all-binaries: azure-cni-plugin azure-cns azure-npm
127127
all-images:
128128
@echo "Nothing to build. Skip."
129129
endif
@@ -662,14 +662,14 @@ ifeq ($(GOOS),linux)
662662
endif
663663
cd $(CNI_MULTITENANCY_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_MULTITENANCY_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) azure-vnet-telemetry$(EXE_EXT) 10-azure.conflist azure-vnet-telemetry.config
664664

665+
ifeq ($(GOOS),linux)
665666
$(MKDIR) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
666667
cp cni/azure-$(GOOS)-multitenancy-transparent-vlan.conflist $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/10-azure.conflist
667-
cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
668-
ifeq ($(GOOS),linux)
668+
cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
669669
cp telemetry/azure-vnet-telemetry.config $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/azure-vnet-telemetry.config
670670
cp $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)
671+
cd $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-telemetry$(EXE_EXT) 10-azure.conflist azure-vnet-telemetry.config
671672
endif
672-
cd $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_ARCHIVE_NAME) azure-vnet$(EXE_EXT) azure-vnet-ipam$(EXE_EXT) azure-vnet-telemetry$(EXE_EXT) 10-azure.conflist azure-vnet-telemetry.config
673673

674674
$(MKDIR) $(CNI_SWIFT_BUILD_DIR)
675675
cp cni/azure-$(GOOS)-swift.conflist $(CNI_SWIFT_BUILD_DIR)/10-azure.conflist

0 commit comments

Comments
 (0)