fixup

Author: jpayne3506

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

@@ -12,7 +12,7 @@ mkdir -p "$OUT_DIR"/files
 pushd "$REPO_ROOT"/azure-ip-masq-merger
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/azure-ip-masq-merger"$FILE_EXT" \
-    -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" \
+    -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" \
     -gcflags="-dwarflocationlists=true" \
     .
 popd

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

@@ -11,7 +11,7 @@ mkdir -p "$OUT_DIR"/files
 pushd "$REPO_ROOT"/azure-ipam
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/azure-ipam"$FILE_EXT" \
-    -ldflags "-s -w" "-X github.com/Azure/azure-container-networking/azure-ipam/internal/buildinfo.Version="$AZURE_IPAM_VERSION" -X main.version="$AZURE_IPAM_VERSION"" \
+    -ldflags "-s -w -X github.com/Azure/azure-container-networking/azure-ipam/internal/buildinfo.Version="$AZURE_IPAM_VERSION" -X main.version="$AZURE_IPAM_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     .
 

.pipelines/build/scripts/cni.sh

@@ -13,7 +13,7 @@ CNI_NET_DIR="$REPO_ROOT"/cni/network/plugin
 pushd "$CNI_NET_DIR"
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/azure-vnet"$FILE_EXT" \
-    -ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
+    -ldflags "-s -w -X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
 popd
@@ -22,7 +22,7 @@ STATELESS_CNI_BUILD_DIR="$REPO_ROOT"/cni/network/stateless
 pushd "$STATELESS_CNI_BUILD_DIR"
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/azure-vnet-stateless"$FILE_EXT" \
-    -ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
+    -ldflags "-s -w -X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
 popd
@@ -31,7 +31,7 @@ CNI_IPAM_DIR="$REPO_ROOT"/cni/ipam/plugin
 pushd "$CNI_IPAM_DIR"
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/azure-vnet-ipam"$FILE_EXT" \
-    -ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
+    -ldflags "-s -w -X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
 popd
@@ -40,7 +40,7 @@ CNI_IPAMV6_DIR="$REPO_ROOT"/cni/ipam/pluginv6
 pushd "$CNI_IPAMV6_DIR"
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/azure-vnet-ipamv6"$FILE_EXT" \
-    -ldflags "-s -w" "-X main.version="$CNI_VERSION"" \
+    -ldflags "-s -w -X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
 popd
@@ -49,7 +49,7 @@ CNI_TELEMETRY_DIR="$REPO_ROOT"/cni/telemetry/service
 pushd "$CNI_TELEMETRY_DIR"
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/azure-vnet-telemetry"$FILE_EXT" \
-    -ldflags "-s -w" "-X main.version="$CNI_VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" \
+    -ldflags "-s -w -X main.version="$CNI_VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" \
     -gcflags="-dwarflocationlists=true" \
    ./telemetrymain.go
 popd

.pipelines/build/scripts/cns.sh

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

.pipelines/build/scripts/dropgz.sh

@@ -58,7 +58,7 @@ pushd "$DROPGZ_BUILD_DIR"/pkg/mod/"$DROPGZ_MOD_DOWNLOAD_PATH"
   mv "$PAYLOAD_DIR"/* pkg/embed/fs/
   GOOS="$OS" go build -v -trimpath -a \
     -o "$OUT_DIR"/bin/dropgz"$FILE_EXT" \
-    -ldflags "-s -w" "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$DROPGZ_VERSION"" \
+    -ldflags "-s -w -X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$DROPGZ_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     main.go
 popd

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

@@ -159,6 +159,6 @@ pushd "$REPO_ROOT"/bpf-prog/ipv6-hp-bpf
   go generate ./...
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/ipv6-hp-bpf"$FILE_EXT" \
-    -ldflags "-s -w" "-X main.version="$IPV6_HP_BPF_VERSION"" \
+    -ldflags "-s -w -X main.version="$IPV6_HP_BPF_VERSION"" \
     -gcflags="-dwarflocationlists=true" .
 popd

.pipelines/build/scripts/npm.sh

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

azure-ip-masq-merger/Dockerfile

@@ -9,7 +9,7 @@ ARG OS
 ARG VERSION
 WORKDIR /azure-ip-masq-merger
 COPY ./azure-ip-masq-merger .
-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" .
+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" .
 
 FROM scratch AS linux
 COPY --from=azure-ip-masq-merger /go/bin/ip-masq-merger azure-ip-masq-merger

azure-ipam/Dockerfile

@@ -14,7 +14,7 @@ ARG OS
 ARG VERSION
 WORKDIR /azure-ipam
 COPY ./azure-ipam .
-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" .
+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" .
 
 FROM mariner-core AS compressor
 ARG OS
@@ -31,7 +31,7 @@ ARG VERSION
 RUN go mod download github.com/azure/azure-container-networking/dropgz@$DROPGZ_VERSION
 WORKDIR /go/pkg/mod/github.com/azure/azure-container-networking/dropgz\@$DROPGZ_VERSION
 COPY --from=compressor /payload/* pkg/embed/fs/
-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
+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
 
 FROM scratch AS linux
 COPY --from=dropgz /go/bin/dropgz dropgz

bpf-prog/ipv6-hp-bpf/linux.Dockerfile

@@ -37,7 +37,7 @@ RUN if [ "$ARCH" = "arm64" ]; then \
 ENV C_INCLUDE_PATH=/usr/include/bpf
 RUN if [ "$DEBUG" = "true" ]; then echo "\n#define DEBUG" >> /bpf-prog/ipv6-hp-bpf/include/helper.h; fi
 RUN GOOS=$OS CGO_ENABLED=0 go generate ./...
-RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/ipv6-hp-bpf -trimpath -ldflags "-s -w" "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
+RUN GOOS=$OS CGO_ENABLED=0 go build -a -o /go/bin/ipv6-hp-bpf -trimpath -ldflags "-s -w -X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
 
 FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 AS linux
 COPY --from=builder /go/bin/ipv6-hp-bpf /ipv6-hp-bpf