From f2dea1dbaa09a7ad529d685f23c5c83fbb4a3b8f Mon Sep 17 00:00:00 2001 From: QxBytes Date: Fri, 9 Feb 2024 11:50:36 -0800 Subject: [PATCH 1/2] Remove cnm and windows transparent vlan targets when building all binaries --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index dc85d2b2a2..35130f8e93 100644 --- a/Makefile +++ b/Makefile @@ -120,10 +120,10 @@ all-binaries-platforms: ## Make all platform binaries # OS specific binaries/images ifeq ($(GOOS),linux) -all-binaries: acncli azure-cnm-plugin azure-cni-plugin azure-cns azure-npm azure-ipam +all-binaries: acncli azure-cni-plugin azure-cns azure-npm azure-ipam all-images: npm-image cns-image cni-manager-image else -all-binaries: azure-cnm-plugin azure-cni-plugin azure-cns azure-npm +all-binaries: azure-cni-plugin azure-cns azure-npm all-images: @echo "Nothing to build. Skip." endif @@ -662,14 +662,14 @@ ifeq ($(GOOS),linux) endif 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 +ifeq ($(GOOS),linux) $(MKDIR) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) cp cni/azure-$(GOOS)-multitenancy-transparent-vlan.conflist $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/10-azure.conflist cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) -ifeq ($(GOOS),linux) cp telemetry/azure-vnet-telemetry.config $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/azure-vnet-telemetry.config cp $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) -endif 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 +endif $(MKDIR) $(CNI_SWIFT_BUILD_DIR) cp cni/azure-$(GOOS)-swift.conflist $(CNI_SWIFT_BUILD_DIR)/10-azure.conflist From 0bc4ca64edfcd7227561aa7c354866084d44b9b5 Mon Sep 17 00:00:00 2001 From: QxBytes Date: Wed, 14 Feb 2024 16:28:20 -0800 Subject: [PATCH 2/2] Remove azure ipam from transparent vlan build --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 35130f8e93..251110e3c3 100644 --- a/Makefile +++ b/Makefile @@ -665,10 +665,10 @@ endif ifeq ($(GOOS),linux) $(MKDIR) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) cp cni/azure-$(GOOS)-multitenancy-transparent-vlan.conflist $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/10-azure.conflist - cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) + cp $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) cp telemetry/azure-vnet-telemetry.config $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR)/azure-vnet-telemetry.config cp $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) $(CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR) - 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 + 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 endif $(MKDIR) $(CNI_SWIFT_BUILD_DIR)