Skip to content

Commit 8bb002c

Browse files
behzad-mirbehzad-mir
committed
Make the telemtry a binary in Azure-cni image
1 parent e505a24 commit 8bb002c

File tree

3 files changed

+45
-132
lines changed

3 files changed

+45
-132
lines changed

‎Makefile‎

Lines changed: 44 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ RMDIR := powershell.exe -NoProfile -Command Remove-Item -Recurse -Force
1616
endif
1717

1818
# Build defaults.
19-
GOOS ?= $(shell go env GOOS)
20-
GOARCH ?= $(shell go env GOARCH)
21-
GOOSES ?= "linux windows" # To override at the cli do: GOOSES="\"darwin bsd\""
22-
GOARCHES ?= "amd64 arm64" # To override at the cli do: GOARCHES="\"ppc64 mips\""
19+
GOOS ?= $(shell go env GOOS)
20+
GOARCH ?= $(shell go env GOARCH)
21+
GOOSES ?= "linux windows" # To override at the cli do: GOOSES="\"darwin bsd\""
22+
GOARCHES ?= "amd64 arm64" # To override at the cli do: GOARCHES="\"ppc64 mips\""
23+
LD_BUILD_FLAGS ?= ""
2324

2425
# Windows specific extensions
2526
# set these based on the GOOS, not the OS
@@ -32,8 +33,9 @@ endif
3233
# Interrogate the git repo and set some variables
3334
REPO_ROOT ?= $(shell git rev-parse --show-toplevel)
3435
REVISION ?= $(shell git rev-parse --short HEAD)
35-
ACN_VERSION ?= $(shell git describe --exclude "azure-iptables-monitor*" --exclude "azure-ip-masq-merger*" --exclude "azure-ipam*" --exclude "dropgz*" --exclude "zapai*" --exclude "ipv6-hp-bpf*" --tags --always)
36+
ACN_VERSION ?= $(shell git describe --exclude "azure-iptables-monitor*" --exclude "azure-ip-masq-merger*" --exclude "azure-ipam*" --exclude "dropgz*" --exclude "zapai*" --exclude "ipv6-hp-bpf*" --exclude "azure-block-iptables*" --tags --always)
3637
IPV6_HP_BPF_VERSION ?= $(notdir $(shell git describe --match "ipv6-hp-bpf*" --tags --always))
38+
AZURE_BLOCK_IPTABLES_VERSION ?= $(notdir $(shell git describe --match "azure-block-iptables*" --tags --always))
3739
AZURE_IPAM_VERSION ?= $(notdir $(shell git describe --match "azure-ipam*" --tags --always))
3840
AZURE_IP_MASQ_MERGER_VERSION ?= $(notdir $(shell git describe --match "azure-ip-masq-merger*" --tags --always))
3941
AZURE_IPTABLES_MONITOR_VERSION ?= $(notdir $(shell git describe --match "azure-iptables-monitor*" --tags --always))
@@ -47,6 +49,7 @@ AZURE_IPAM_DIR = $(REPO_ROOT)/azure-ipam
4749
AZURE_IP_MASQ_MERGER_DIR = $(REPO_ROOT)/azure-ip-masq-merger
4850
AZURE_IPTABLES_MONITOR_DIR = $(REPO_ROOT)/azure-iptables-monitor
4951
IPV6_HP_BPF_DIR = $(REPO_ROOT)/bpf-prog/ipv6-hp-bpf
52+
AZURE_BLOCK_IPTABLES_DIR = $(REPO_ROOT)/bpf-prog/azure-block-iptables
5053

5154
CNI_NET_DIR = $(REPO_ROOT)/cni/network/plugin
5255
CNI_IPAM_DIR = $(REPO_ROOT)/cni/ipam/plugin
@@ -62,6 +65,7 @@ AZURE_IPAM_BUILD_DIR = $(BUILD_DIR)/azure-ipam
6265
AZURE_IP_MASQ_MERGER_BUILD_DIR = $(BUILD_DIR)/azure-ip-masq-merger
6366
AZURE_IPTABLES_MONITOR_BUILD_DIR = $(BUILD_DIR)/azure-iptables-monitor
6467
IPV6_HP_BPF_BUILD_DIR = $(BUILD_DIR)/bpf-prog/ipv6-hp-bpf
68+
AZURE_BLOCK_IPTABLES_BUILD_DIR = $(BUILD_DIR)/bpf-prog/azure-block-iptables
6569
IMAGE_DIR = $(OUTPUT_DIR)/images
6670

6771
CNI_BUILD_DIR = $(BUILD_DIR)/cni
@@ -84,10 +88,6 @@ ACN_PACKAGE_PATH = github.com/Azure/azure-container-networking
8488
CNI_AI_PATH=$(ACN_PACKAGE_PATH)/telemetry.aiMetadata
8589
CNS_AI_PATH=$(ACN_PACKAGE_PATH)/cns/logger.aiMetadata
8690
NPM_AI_PATH=$(ACN_PACKAGE_PATH)/npm.aiMetadata
87-
CNI_TELEMETRY_SIDECAR_DIR = $(REPO_ROOT)/cns/cni-telemetry-sidecar
88-
CNI_TELEMETRY_SIDECAR_BUILD_DIR = $(BUILD_DIR)/cni-telemetry-sidecar
89-
CNI_TELEMETRY_SIDECAR_AI_ID = $(CNI_AI_ID) # Reuse CNI AI ID
90-
CNI_TELEMETRY_SIDECAR_VERSION = $(CNS_VERSION) # Version follows CNS
9191

9292
# Tool paths
9393
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
@@ -115,7 +115,7 @@ AZURE_IPAM_ARCHIVE_NAME = azure-ipam-$(GOOS)-$(GOARCH)-$(AZURE_IPAM_VERSION).$(A
115115
AZURE_IP_MASQ_MERGER_ARCHIVE_NAME = azure-ip-masq-merger-$(GOOS)-$(GOARCH)-$(AZURE_IP_MASQ_MERGER_VERSION).$(ARCHIVE_EXT)
116116
AZURE_IPTABLES_MONITOR_ARCHIVE_NAME = azure-iptables-monitor-$(GOOS)-$(GOARCH)-$(AZURE_IPTABLES_MONITOR_VERSION).$(ARCHIVE_EXT)
117117
IPV6_HP_BPF_ARCHIVE_NAME = ipv6-hp-bpf-$(GOOS)-$(GOARCH)-$(IPV6_HP_BPF_VERSION).$(ARCHIVE_EXT)
118-
CNI_TELEMETRY_SIDECAR_ARCHIVE_NAME = azure-cni-telemetry-sidecar-$(GOOS)-$(GOARCH)-$(CNI_TELEMETRY_SIDECAR_VERSION).$(ARCHIVE_EXT)
118+
AZURE_BLOCK_IPTABLES_ARCHIVE_NAME = azure-block-iptables-$(GOOS)-$(GOARCH)-$(AZURE_BLOCK_IPTABLES_VERSION).$(ARCHIVE_EXT)
119119

120120
# Image info file names.
121121
CNI_IMAGE_INFO_FILE = azure-cni-$(CNI_VERSION).txt
@@ -132,7 +132,7 @@ all-binaries-platforms: ## Make all platform binaries
132132

133133
# OS specific binaries/images
134134
ifeq ($(GOOS),linux)
135-
all-binaries: acncli azure-cni-plugin azure-cns azure-npm azure-ipam azure-ip-masq-merger azure-iptables-monitor ipv6-hp-bpf cni-telemetry-sidecar
135+
all-binaries: acncli azure-cni-plugin azure-cns azure-npm azure-ipam azure-ip-masq-merger azure-iptables-monitor ipv6-hp-bpf azure-block-iptables
136136
all-images: npm-image cns-image cni-manager-image azure-ip-masq-merger-image azure-iptables-monitor-image ipv6-hp-bpf-image
137137
else
138138
all-binaries: azure-cni-plugin azure-cns azure-npm
@@ -147,9 +147,10 @@ acncli: acncli-binary acncli-archive
147147
azure-npm: azure-npm-binary npm-archive
148148
azure-ipam: azure-ipam-binary azure-ipam-archive
149149
ipv6-hp-bpf: ipv6-hp-bpf-binary ipv6-hp-bpf-archive
150+
azure-block-iptables: azure-block-iptables-binary azure-block-iptables-archive
150151
azure-ip-masq-merger: azure-ip-masq-merger-binary azure-ip-masq-merger-archive
151152
azure-iptables-monitor: azure-iptables-monitor-binary azure-iptables-monitor-archive
152-
cni-telemetry-sidecar: cni-telemetry-sidecar-binary cni-telemetry-sidecar-archive
153+
153154

154155
##@ Versioning
155156

@@ -173,6 +174,9 @@ azure-iptables-monitor-version: ## prints the azure-iptables-monitor version
173174
ipv6-hp-bpf-version: ## prints the ipv6-hp-bpf version
174175
@echo $(IPV6_HP_BPF_VERSION)
175176

177+
azure-block-iptables-version: ## prints the azure-block-iptables version
178+
@echo $(AZURE_BLOCK_IPTABLES_VERSION)
179+
176180
cni-version: ## prints the cni version
177181
@echo $(CNI_VERSION)
178182

@@ -189,15 +193,15 @@ zapai-version: ## prints the zapai version
189193

190194
# Build the delegated IPAM plugin binary.
191195
azure-ipam-binary:
192-
cd $(AZURE_IPAM_DIR) && CGO_ENABLED=0 go build -v -o $(AZURE_IPAM_BUILD_DIR)/azure-ipam$(EXE_EXT) -ldflags "-X github.com/Azure/azure-container-networking/azure-ipam/internal/buildinfo.Version=$(AZURE_IPAM_VERSION)" -gcflags="-dwarflocationlists=true"
196+
cd $(AZURE_IPAM_DIR) && CGO_ENABLED=0 go build -v -o $(AZURE_IPAM_BUILD_DIR)/azure-ipam$(EXE_EXT) -ldflags "-X github.com/Azure/azure-container-networking/azure-ipam/internal/buildinfo.Version=$(AZURE_IPAM_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
193197

194198
# Build the ipv6-hp-bpf binary.
195199
ipv6-hp-bpf-binary:
196200
cd $(IPV6_HP_BPF_DIR) && CGO_ENABLED=0 go generate ./...
197-
cd $(IPV6_HP_BPF_DIR)/cmd/ipv6-hp-bpf && CGO_ENABLED=0 go build -v -o $(IPV6_HP_BPF_BUILD_DIR)/ipv6-hp-bpf$(EXE_EXT) -ldflags "-X main.version=$(IPV6_HP_BPF_VERSION)" -gcflags="-dwarflocationlists=true"
201+
cd $(IPV6_HP_BPF_DIR)/cmd/ipv6-hp-bpf && CGO_ENABLED=0 go build -v -o $(IPV6_HP_BPF_BUILD_DIR)/ipv6-hp-bpf$(EXE_EXT) -ldflags "-X main.version=$(IPV6_HP_BPF_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
198202

199-
# Libraries for ipv6-hp-bpf
200-
ipv6-hp-bpf-lib:
203+
# Libraries for bpf
204+
bpf-lib:
201205
ifeq ($(GOARCH),amd64)
202206
sudo apt-get update && sudo apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-multilib
203207
for dir in /usr/include/x86_64-linux-gnu/*; do sudo ln -sfn "$$dir" /usr/include/$$(basename "$$dir"); done
@@ -206,51 +210,47 @@ else ifeq ($(GOARCH),arm64)
206210
for dir in /usr/include/aarch64-linux-gnu/*; do sudo ln -sfn "$$dir" /usr/include/$$(basename "$$dir"); done
207211
endif
208212

213+
# Build the azure-block-iptables binary.
214+
azure-block-iptables-binary:
215+
cd $(AZURE_BLOCK_IPTABLES_DIR) && CGO_ENABLED=0 go generate ./...
216+
cd $(AZURE_BLOCK_IPTABLES_DIR)/cmd/azure-block-iptables && CGO_ENABLED=0 go build -v -o $(AZURE_BLOCK_IPTABLES_BUILD_DIR)/azure-block-iptables$(EXE_EXT) -ldflags "-X main.version=$(AZURE_BLOCK_IPTABLES_VERSION)" -gcflags="-dwarflocationlists=true"
217+
209218
# Build the Azure CNI network binary.
210219
azure-vnet-binary:
211-
cd $(CNI_NET_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION)" -gcflags="-dwarflocationlists=true"
220+
cd $(CNI_NET_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
212221

213222
# Build the Azure CNI stateless network binary
214223
azure-vnet-stateless-binary:
215-
cd $(STATELESS_CNI_NET_DIR) && CGO_ENABLED=0 go build -v -o $(STATELESS_CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION)" -gcflags="-dwarflocationlists=true"
224+
cd $(STATELESS_CNI_NET_DIR) && CGO_ENABLED=0 go build -v -o $(STATELESS_CNI_BUILD_DIR)/azure-vnet$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
216225

217226
# Build the Azure CNI IPAM binary.
218227
azure-vnet-ipam-binary:
219-
cd $(CNI_IPAM_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION)" -gcflags="-dwarflocationlists=true"
228+
cd $(CNI_IPAM_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
220229

221230
# Build the Azure CNI IPAMV6 binary.
222231
azure-vnet-ipamv6-binary:
223-
cd $(CNI_IPAMV6_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION)" -gcflags="-dwarflocationlists=true"
232+
cd $(CNI_IPAMV6_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet-ipamv6$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
224233

225234
# Build the Azure CNI telemetry binary.
226235
azure-vnet-telemetry-binary:
227-
cd $(CNI_TELEMETRY_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION) -X $(CNI_AI_PATH)=$(CNI_AI_ID)" -gcflags="-dwarflocationlists=true"
228-
229-
# Build the Azure CNI Telemetry Sidecar binary.
230-
cni-telemetry-sidecar-binary: ## build cni-telemetry-sidecar binary.
231-
$(MKDIR) $(CNI_TELEMETRY_SIDECAR_BUILD_DIR)
232-
cd $(CNI_TELEMETRY_SIDECAR_DIR) && CGO_ENABLED=0 go build \
233-
-v \
234-
-o $(CNI_TELEMETRY_SIDECAR_BUILD_DIR)/azure-cni-telemetry-sidecar$(EXE_EXT) \
235-
-ldflags "-X main.version=$(CNI_TELEMETRY_SIDECAR_VERSION) -X $(CNI_AI_PATH)=$(CNI_TELEMETRY_SIDECAR_AI_ID)" \
236-
-gcflags="-dwarflocationlists=true" \
237-
.
236+
cd $(CNI_TELEMETRY_DIR) && CGO_ENABLED=0 go build -v -o $(CNI_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(CNI_VERSION) -X $(CNI_AI_PATH)=$(CNI_AI_ID) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
237+
238238
# Build the Azure CLI network binary.
239239
acncli-binary:
240-
cd $(ACNCLI_DIR) && CGO_ENABLED=0 go build -v -o $(ACNCLI_BUILD_DIR)/acn$(EXE_EXT) -ldflags "-X main.version=$(ACN_VERSION)" -gcflags="-dwarflocationlists=true"
240+
cd $(ACNCLI_DIR) && CGO_ENABLED=0 go build -v -o $(ACNCLI_BUILD_DIR)/acn$(EXE_EXT) -ldflags "-X main.version=$(ACN_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
241241

242242
# Build the Azure CNS binary.
243243
azure-cns-binary:
244-
cd $(CNS_DIR) && CGO_ENABLED=0 go build -v -o $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT) -ldflags "-X main.version=$(CNS_VERSION) -X $(CNS_AI_PATH)=$(CNS_AI_ID) -X $(CNI_AI_PATH)=$(CNI_AI_ID)" -gcflags="-dwarflocationlists=true"
244+
cd $(CNS_DIR) && CGO_ENABLED=0 go build -v -o $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT) -ldflags "-X main.version=$(CNS_VERSION) -X $(CNS_AI_PATH)=$(CNS_AI_ID) -X $(CNI_AI_PATH)=$(CNI_AI_ID) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
245245

246246
# Build the Azure NPM binary.
247247
azure-npm-binary:
248-
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"
249-
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"
248+
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) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
249+
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) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
250250

251251
# Build the azure-ip-masq-merger binary.
252252
azure-ip-masq-merger-binary:
253-
cd $(AZURE_IP_MASQ_MERGER_DIR) && CGO_ENABLED=0 go build -v -o $(AZURE_IP_MASQ_MERGER_BUILD_DIR)/azure-ip-masq-merger$(EXE_EXT) -ldflags "-X main.version=$(AZURE_IP_MASQ_MERGER_VERSION)" -gcflags="-dwarflocationlists=true"
253+
cd $(AZURE_IP_MASQ_MERGER_DIR) && CGO_ENABLED=0 go build -v -o $(AZURE_IP_MASQ_MERGER_BUILD_DIR)/azure-ip-masq-merger$(EXE_EXT) -ldflags "-X main.version=$(AZURE_IP_MASQ_MERGER_VERSION) $(LD_BUILD_FLAGS)" -gcflags="-dwarflocationlists=true"
254254

255255
# Build the azure-iptables-monitor binary.
256256
azure-iptables-monitor-binary:
@@ -302,7 +302,6 @@ CNS_IMAGE = azure-cns
302302
NPM_IMAGE = azure-npm
303303
AZURE_IP_MASQ_MERGER_IMAGE = azure-ip-masq-merger
304304
AZURE_IPTABLES_MONITOR_IMAGE = azure-iptables-monitor
305-
CNI_TELEMETRY_SIDECAR_IMAGE = azure-cni-telemetry-sidecar
306305

307306
## Image platform tags.
308307
ACNCLI_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))-$(ACN_VERSION)
@@ -316,7 +315,7 @@ CNS_WINDOWS_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))-$(CNS_VERSION)-$(OS_SKU_W
316315
NPM_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))-$(NPM_VERSION)
317316
AZURE_IP_MASQ_MERGER_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))-$(AZURE_IP_MASQ_MERGER_VERSION)
318317
AZURE_IPTABLES_MONITOR_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))-$(AZURE_IPTABLES_MONITOR_VERSION)
319-
CNI_TELEMETRY_SIDECAR_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))-$(CNI_TELEMETRY_SIDECAR_VERSION)
318+
320319

321320
qemu-user-static: ## Set up the host to run qemu multiplatform container builds.
322321
sudo $(CONTAINER_RUNTIME) run --rm --privileged multiarch/qemu-user-static --reset -p yes
@@ -597,35 +596,6 @@ npm-image-pull: ## pull cns container image.
597596
IMAGE=$(NPM_IMAGE) \
598597
TAG=$(NPM_PLATFORM_TAG)
599598

600-
# cni-telemetry-sidecar
601-
602-
cni-telemetry-sidecar-image-name: # util target to print the CNI telemetry sidecar image name
603-
@echo $(CNI_TELEMETRY_SIDECAR_IMAGE)
604-
605-
cni-telemetry-sidecar-image-name-and-tag: # util target to print the CNI telemetry sidecar image name and tag.
606-
@echo $(IMAGE_REGISTRY)/$(CNI_TELEMETRY_SIDECAR_IMAGE):$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG)
607-
608-
cni-telemetry-sidecar-image: ## build cni-telemetry-sidecar container image.
609-
$(MAKE) container \
610-
DOCKERFILE=cns/cni-telemetry-sidecar/Dockerfile \
611-
IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
612-
EXTRA_BUILD_ARGS='--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_TELEMETRY_SIDECAR_AI_ID) --build-arg VERSION=$(CNI_TELEMETRY_SIDECAR_VERSION)' \
613-
PLATFORM=$(PLATFORM) \
614-
TAG=$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG) \
615-
TARGET=$(OS) \
616-
OS=$(OS) \
617-
ARCH=$(ARCH)
618-
619-
cni-telemetry-sidecar-image-push: ## push cni-telemetry-sidecar container image.
620-
$(MAKE) container-push \
621-
IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
622-
TAG=$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG)
623-
624-
cni-telemetry-sidecar-image-pull: ## pull cni-telemetry-sidecar container image.
625-
$(MAKE) container-pull \
626-
IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
627-
TAG=$(CNI_TELEMETRY_SIDECAR_PLATFORM_TAG)
628-
629599
## Reusable targets for building multiplat container image manifests.
630600

631601
IMAGE_ARCHIVE_DIR ?= $(shell pwd)
@@ -781,21 +751,6 @@ npm-skopeo-archive: ## export tar archive of multiplat container manifest.
781751
IMAGE=$(NPM_IMAGE) \
782752
TAG=$(NPM_VERSION)
783753

784-
cni-telemetry-sidecar-manifest-build: ## build cni-telemetry-sidecar multiplat container manifest.
785-
$(MAKE) manifest-build \
786-
PLATFORMS="$(PLATFORMS)" \
787-
IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
788-
TAG=$(CNI_TELEMETRY_SIDECAR_VERSION)
789-
790-
cni-telemetry-sidecar-manifest-push: ## push cni-telemetry-sidecar multiplat container manifest
791-
$(MAKE) manifest-push \
792-
IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
793-
TAG=$(CNI_TELEMETRY_SIDECAR_VERSION)
794-
795-
cni-telemetry-sidecar-skopeo-archive: ## export tar archive of cni-telemetry-sidecar multiplat container manifest.
796-
$(MAKE) manifest-skopeo-archive \
797-
IMAGE=$(CNI_TELEMETRY_SIDECAR_IMAGE) \
798-
TAG=$(CNI_TELEMETRY_SIDECAR_VERSION)
799754

800755
########################### Archives ################################
801756

@@ -906,12 +861,12 @@ ifeq ($(GOOS),linux)
906861
cd $(IPV6_HP_BPF_BUILD_DIR) && $(ARCHIVE_CMD) $(IPV6_HP_BPF_ARCHIVE_NAME) ipv6-hp-bpf$(EXE_EXT)
907862
endif
908863

909-
# Create a CNI Telemetry Sidecar archive for the target platform.
910-
.PHONY: cni-telemetry-sidecar-archive
911-
cni-telemetry-sidecar-archive: cni-telemetry-sidecar-binary
864+
# Create a azure-block-iptables archive for the target platform.
865+
.PHONY: azure-block-iptables-archive
866+
azure-block-iptables-archive: azure-block-iptables-binary
912867
ifeq ($(GOOS),linux)
913-
$(MKDIR) $(CNI_TELEMETRY_SIDECAR_BUILD_DIR)
914-
cd $(CNI_TELEMETRY_SIDECAR_BUILD_DIR) && $(ARCHIVE_CMD) $(CNI_TELEMETRY_SIDECAR_ARCHIVE_NAME) azure-cni-telemetry-sidecar$(EXE_EXT)
868+
$(MKDIR) $(AZURE_BLOCK_IPTABLES_BUILD_DIR)
869+
cd $(AZURE_BLOCK_IPTABLES_BUILD_DIR) && $(ARCHIVE_CMD) $(AZURE_BLOCK_IPTABLES_ARCHIVE_NAME) azure-block-iptables$(EXE_EXT)
915870
endif
916871

917872
##@ Utils
@@ -957,7 +912,7 @@ CNI_TYPE ?= cilium
957912

958913
test-all: test-azure-ipam test-azure-ip-masq-merger test-azure-iptables-monitor test-main ## run all unit tests.
959914

960-
test-main:
915+
test-main:
961916
go test -mod=readonly -buildvcs=false -tags "unit" --skip 'TestE2E*' -race -covermode atomic -coverprofile=coverage-main.out $(COVER_PKG)/...
962917
go tool cover -func=coverage-main.out
963918

@@ -1095,3 +1050,4 @@ help: ## Display this help
10951050

10961051
proto-gen: ## Generates source code from protobuf files
10971052
protoc --go_out=. --go-grpc_out=. cns/grpc/proto/server.proto
1053+

‎cni/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet -trimpath -ldflags
2222
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet-telemetry -trimpath -ldflags "-X main.version="$VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" -gcflags="-dwarflocationlists=true" cni/telemetry/service/telemetrymain.go
2323
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet-ipam -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" cni/ipam/plugin/main.go
2424
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-vnet-stateless -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" cni/network/stateless/main.go
25+
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-cni-telemetry-sidecar -trimpath -ldflags "-X main.version=$VERSION" -gcflags="-dwarflocationlists=true" cns/cni-telemetry-sidecar/main.go
2526

2627
FROM mariner-core AS compressor
2728
ARG OS

‎cns/cni-telemetry-sidecar/Dockerfile‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)