Skip to content

Commit cf4a7aa

Browse files
jpayne3506jpayne3506
committed
feat: Remove symbols from all produced binaries
1 parent 7d56d36 commit cf4a7aa

File tree

17 files changed

+63
-62
lines changed

17 files changed

+63
-62
lines changed

‎.pipelines/build/scripts/azure-ip-masq-merger.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ set -eux
44
[[ $OS =~ windows ]] && { echo "azure-ip-masq-merger is not supported on Windows"; exit 1; }
55
FILE_EXT=''
66

7-
export CGO_ENABLED=0
7+
export CGO_ENABLED=0
88

99
mkdir -p "$OUT_DIR"/bin
1010
mkdir -p "$OUT_DIR"/files
1111

1212
pushd "$REPO_ROOT"/azure-ip-masq-merger
1313
GOOS="$OS" go build -v -a -trimpath \
1414
-o "$OUT_DIR"/bin/azure-ip-masq-merger"$FILE_EXT" \
15-
-ldflags "-X github.com/Azure/azure-container-networking/azure-ip-masq-merger/internal/buildinfo.Version=$AZURE_IP_MASQ_MERGER_VERSION -X main.version=$AZURE_IP_MASQ_MERGER_VERSION" \
15+
-ldflags "-s -w" "-X github.com/Azure/azure-container-networking/azure-ip-masq-merger/internal/buildinfo.Version=$AZURE_IP_MASQ_MERGER_VERSION -X main.version=$AZURE_IP_MASQ_MERGER_VERSION" \
1616
-gcflags="-dwarflocationlists=true" \
1717
.
1818
popd

‎.pipelines/build/scripts/azure-ipam.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ set -eux
33

44
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export CGO_ENABLED=0
6+
export CGO_ENABLED=0
77

88
mkdir -p "$OUT_DIR"/bin
99
mkdir -p "$OUT_DIR"/files
1010

1111
pushd "$REPO_ROOT"/azure-ipam
1212
GOOS="$OS" go build -v -a -trimpath \
1313
-o "$OUT_DIR"/bin/azure-ipam"$FILE_EXT" \
14-
-ldflags "-X github.com/Azure/azure-container-networking/azure-ipam/internal/buildinfo.Version="$AZURE_IPAM_VERSION" -X main.version="$AZURE_IPAM_VERSION"" \
14+
-ldflags "-s -w" "-X github.com/Azure/azure-container-networking/azure-ipam/internal/buildinfo.Version="$AZURE_IPAM_VERSION" -X main.version="$AZURE_IPAM_VERSION"" \
1515
-gcflags="-dwarflocationlists=true" \
1616
.
1717

‎.pipelines/build/scripts/cni.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ set -eux
66
mkdir -p "$OUT_DIR"/files
77
mkdir -p "$OUT_DIR"/bin
88

9-
export CGO_ENABLED=0
9+
export CGO_ENABLED=0
1010

1111

1212
CNI_NET_DIR="$REPO_ROOT"/cni/network/plugin
1313
pushd "$CNI_NET_DIR"
1414
GOOS="$OS" go build -v -a -trimpath \
1515
-o "$OUT_DIR"/bin/azure-vnet"$FILE_EXT" \
16-
-ldflags "-X main.version="$CNI_VERSION"" \
16+
-ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
1717
-gcflags="-dwarflocationlists=true" \
1818
./main.go
1919
popd
@@ -22,7 +22,7 @@ STATELESS_CNI_BUILD_DIR="$REPO_ROOT"/cni/network/stateless
2222
pushd "$STATELESS_CNI_BUILD_DIR"
2323
GOOS="$OS" go build -v -a -trimpath \
2424
-o "$OUT_DIR"/bin/azure-vnet-stateless"$FILE_EXT" \
25-
-ldflags "-X main.version="$CNI_VERSION"" \
25+
-ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
2626
-gcflags="-dwarflocationlists=true" \
2727
./main.go
2828
popd
@@ -31,7 +31,7 @@ CNI_IPAM_DIR="$REPO_ROOT"/cni/ipam/plugin
3131
pushd "$CNI_IPAM_DIR"
3232
GOOS="$OS" go build -v -a -trimpath \
3333
-o "$OUT_DIR"/bin/azure-vnet-ipam"$FILE_EXT" \
34-
-ldflags "-X main.version="$CNI_VERSION"" \
34+
-ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
3535
-gcflags="-dwarflocationlists=true" \
3636
./main.go
3737
popd
@@ -40,7 +40,7 @@ CNI_IPAMV6_DIR="$REPO_ROOT"/cni/ipam/pluginv6
4040
pushd "$CNI_IPAMV6_DIR"
4141
GOOS="$OS" go build -v -a -trimpath \
4242
-o "$OUT_DIR"/bin/azure-vnet-ipamv6"$FILE_EXT" \
43-
-ldflags "-X main.version="$CNI_VERSION"" \
43+
-ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
4444
-gcflags="-dwarflocationlists=true" \
4545
./main.go
4646
popd
@@ -49,7 +49,7 @@ CNI_TELEMETRY_DIR="$REPO_ROOT"/cni/telemetry/service
4949
pushd "$CNI_TELEMETRY_DIR"
5050
GOOS="$OS" go build -v -a -trimpath \
5151
-o "$OUT_DIR"/bin/azure-vnet-telemetry"$FILE_EXT" \
52-
-ldflags "-X main.version="$CNI_VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" \
52+
-ldflags "-s -w" "-X main.version="$CNI_VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" \
5353
-gcflags="-dwarflocationlists=true" \
5454
./telemetrymain.go
5555
popd

‎.pipelines/build/scripts/cns.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -eux
33

44
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export CGO_ENABLED=0
6+
export CGO_ENABLED=0
77

88
mkdir -p "$OUT_DIR"/files
99
mkdir -p "$OUT_DIR"/bin
@@ -12,7 +12,7 @@ mkdir -p "$OUT_DIR"/scripts
1212
pushd "$REPO_ROOT"/cns
1313
GOOS="$OS" go build -v -a \
1414
-o "$OUT_DIR"/bin/azure-cns"$FILE_EXT" \
15-
-ldflags "-X main.version="$CNS_VERSION" -X "$CNS_AI_PATH"="$CNS_AI_ID"" \
15+
-ldflags "-s -w" "-X main.version="$CNS_VERSION" -X "$CNS_AI_PATH"="$CNS_AI_ID"" \
1616
-gcflags="-dwarflocationlists=true" \
1717
service/*.go
1818
cp kubeconfigtemplate.yaml "$OUT_DIR"/files/kubeconfigtemplate.yaml

‎.pipelines/build/scripts/dropgz.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function files::remove_exe_extensions() {
2020

2121
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
2222

23-
export CGO_ENABLED=0
23+
export CGO_ENABLED=0
2424

2525
mkdir -p "$GEN_DIR"
2626
mkdir -p "$OUT_DIR"/bin
@@ -40,11 +40,11 @@ pushd "$PAYLOAD_DIR"
4040
[[ -d "$OUT_DIR"/bin ]] && cp "$OUT_DIR"/bin/* . || true
4141

4242
[[ $OS =~ windows ]] && files::remove_exe_extensions .
43-
43+
4444
sha256sum * > sum.txt
4545
gzip --verbose --best --recursive .
4646

47-
for file in $(find . -name '*.gz'); do
47+
for file in $(find . -name '*.gz'); do
4848
mv "$file" "${file%%.gz}"
4949
done
5050
popd
@@ -58,7 +58,7 @@ pushd "$DROPGZ_BUILD_DIR"/pkg/mod/"$DROPGZ_MOD_DOWNLOAD_PATH"
5858
mv "$PAYLOAD_DIR"/* pkg/embed/fs/
5959
GOOS="$OS" go build -v -trimpath -a \
6060
-o "$OUT_DIR"/bin/dropgz"$FILE_EXT" \
61-
-ldflags "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$DROPGZ_VERSION"" \
61+
-ldflags "-s -w" "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$DROPGZ_VERSION"" \
6262
-gcflags="-dwarflocationlists=true" \
6363
main.go
6464
popd

‎.pipelines/build/scripts/ipv6-hp-bpf.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function findcp::shared_library() {
3737

3838
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
3939

40-
export CGO_ENABLED=0
40+
export CGO_ENABLED=0
4141
export C_INCLUDE_PATH=/usr/include/bpf
4242

4343
mkdir -p "$OUT_DIR"/bin
@@ -52,15 +52,15 @@ if [[ -f /etc/debian_version ]];then
5252

5353
ARCH=x86_64-linux-gnu
5454
cp /usr/lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
55-
55+
5656
elif [[ $ARCH =~ arm64 ]]; then
5757
apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu
5858

5959
ARCH=aarch64-linux-gnu
6060
cp /usr/lib/"$ARCH"/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
6161
fi
6262

63-
for dir in /usr/include/"$ARCH"/*; do
63+
for dir in /usr/include/"$ARCH"/*; do
6464
ln -sfn "$dir" /usr/include/$(basename "$dir")
6565
done
6666

@@ -101,14 +101,14 @@ else
101101
ARCH=aarch64-linux-gnu
102102
#tdnf install -y glibc-devel.i386
103103
if [[ -f '/usr/lib/ld-linux-aarch64.so.1' ]]; then
104-
cp /usr/lib/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
104+
cp /usr/lib/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
105105
fi
106106
fi
107-
for dir in /usr/include/"$ARCH"/*; do
107+
for dir in /usr/include/"$ARCH"/*; do
108108
if [[ -d $dir ]]; then
109-
ln -sfn "$dir" /usr/include/$(basename "$dir")
109+
ln -sfn "$dir" /usr/include/$(basename "$dir")
110110
elif [[ -f "$dir" ]]; then
111-
ln -Tsfn "$dir" /usr/include/$(basename "$dir")
111+
ln -Tsfn "$dir" /usr/include/$(basename "$dir")
112112
fi
113113
done
114114

@@ -152,13 +152,13 @@ cp /sbin/ip "$OUT_DIR"/bin/ip"$FILE_EXT"
152152
pushd "$REPO_ROOT"/bpf-prog/ipv6-hp-bpf
153153
cp ./cmd/ipv6-hp-bpf/*.go .
154154

155-
if [[ "$DEBUG" =~ ^[T|t]rue$ ]]; then
155+
if [[ "$DEBUG" =~ ^[T|t]rue$ ]]; then
156156
echo -e "\n#define DEBUG" >> ./include/helper.h
157157
fi
158158

159159
go generate ./...
160160
GOOS="$OS" go build -v -a -trimpath \
161161
-o "$OUT_DIR"/bin/ipv6-hp-bpf"$FILE_EXT" \
162-
-ldflags "-X main.version="$IPV6_HP_BPF_VERSION"" \
162+
-ldflags "-s -w" "-X main.version="$IPV6_HP_BPF_VERSION"" \
163163
-gcflags="-dwarflocationlists=true" .
164164
popd

‎.pipelines/build/scripts/npm.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -eux
33

44
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export CGO_ENABLED=0
6+
export CGO_ENABLED=0
77

88
mkdir -p "$OUT_DIR"/files
99
mkdir -p "$OUT_DIR"/bin
@@ -12,7 +12,7 @@ mkdir -p "$OUT_DIR"/scripts
1212
pushd "$REPO_ROOT"/npm
1313
GOOS="$OS" go build -a -v -trimpath \
1414
-o "$OUT_DIR"/bin/azure-npm"$FILE_EXT" \
15-
-ldflags "-X main.version="$NPM_VERSION" -X "$NPM_AI_PATH"="$NPM_AI_ID"" \
15+
-ldflags "-s -w" "-X main.version="$NPM_VERSION" -X "$NPM_AI_PATH"="$NPM_AI_ID"" \
1616
-gcflags="-dwarflocationlists=true" \
1717
./cmd/*.go
1818

‎Makefile‎

Lines changed: 18 additions & 17 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
@@ -176,12 +177,12 @@ zapai-version: ## prints the zapai version
176177

177178
# Build the delegated IPAM plugin binary.
178179
azure-ipam-binary:
179-
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"
180+
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"
180181

181182
# Build the ipv6-hp-bpf binary.
182183
ipv6-hp-bpf-binary:
183184
cd $(IPV6_HP_BPF_DIR) && CGO_ENABLED=0 go generate ./...
184-
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"
185+
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"
185186

186187
# Libraries for ipv6-hp-bpf
187188
ipv6-hp-bpf-lib:
@@ -195,40 +196,40 @@ endif
195196

196197
# Build the Azure CNI network binary.
197198
azure-vnet-binary:
198-
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"
199+
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"
199200

200201
# Build the Azure CNI stateless network binary
201202
azure-vnet-stateless-binary:
202-
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"
203+
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"
203204

204205
# Build the Azure CNI IPAM binary.
205206
azure-vnet-ipam-binary:
206-
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"
207+
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"
207208

208209
# Build the Azure CNI IPAMV6 binary.
209210
azure-vnet-ipamv6-binary:
210-
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"
211+
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"
211212

212213
# Build the Azure CNI telemetry binary.
213214
azure-vnet-telemetry-binary:
214-
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"
215+
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"
215216

216217
# Build the Azure CLI network binary.
217218
acncli-binary:
218-
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"
219+
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"
219220

220221
# Build the Azure CNS binary.
221222
azure-cns-binary:
222-
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"
223+
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"
223224

224225
# Build the Azure NPM binary.
225226
azure-npm-binary:
226-
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"
227-
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"
227+
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"
228+
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"
228229

229230
# Build the azure-ip-masq-merger binary.
230231
azure-ip-masq-merger-binary:
231-
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"
232+
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"
232233

233234
##@ Containers
234235

@@ -825,7 +826,7 @@ CNI_TYPE ?= cilium
825826

826827
test-all: test-azure-ipam test-azure-ip-masq-merger test-main ## run all unit tests.
827828

828-
test-main:
829+
test-main:
829830
go test -mod=readonly -buildvcs=false -tags "unit" --skip 'TestE2E*' -race -covermode atomic -coverprofile=coverage-main.out $(COVER_PKG)/...
830831
go tool cover -func=coverage-main.out
831832

‎azure-ip-masq-merger/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG OS
99
ARG VERSION
1010
WORKDIR /azure-ip-masq-merger
1111
COPY ./azure-ip-masq-merger .
12-
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/ip-masq-merger -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
12+
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/ip-masq-merger -trimpath -ldflags "-s -w" "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
1313

1414
FROM scratch AS linux
1515
COPY --from=azure-ip-masq-merger /go/bin/ip-masq-merger azure-ip-masq-merger

‎azure-ipam/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG OS
1414
ARG VERSION
1515
WORKDIR /azure-ipam
1616
COPY ./azure-ipam .
17-
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-ipam -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
17+
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/azure-ipam -trimpath -ldflags "-s -w" "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
1818

1919
FROM mariner-core AS compressor
2020
ARG OS
@@ -31,7 +31,7 @@ ARG VERSION
3131
RUN go mod download github.com/azure/azure-container-networking/dropgz@$DROPGZ_VERSION
3232
WORKDIR /go/pkg/mod/github.com/azure/azure-container-networking/dropgz\@$DROPGZ_VERSION
3333
COPY --from=compressor /payload/* pkg/embed/fs/
34-
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/dropgz -trimpath -ldflags "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$VERSION"" -gcflags="-dwarflocationlists=true" main.go
34+
RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/dropgz -trimpath -ldflags "-s -w" "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$VERSION"" -gcflags="-dwarflocationlists=true" main.go
3535

3636
FROM scratch AS linux
3737
COPY --from=dropgz /go/bin/dropgz dropgz

0 commit comments

Comments
 (0)