Merge remote-tracking branch 'origin/master' into sanprabhu/rename-iptables-block-binary

Author: santhoshmprabhu

.github/dependabot.yaml

@@ -193,50 +193,3 @@ updates:
       versions: [">=0.30.0"]
     - dependency-name: "k8s.io/kubectl"
       versions: [">=0.30.0"]
-
-
-# Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - v1.25-v1.27
-- package-ecosystem: "gomod"
-  directory: "/"
-  schedule:
-    interval: "daily"
-  commit-message:
-    prefix: "deps"
-  labels: [ "dependencies", "release/1.4" ]
-  open-pull-requests-limit: 10
-  target-branch: "release/v1.4"
-  ignore:
-    - dependency-name: "k8s.io/api"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/apiextensions-apiserver"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/apimachinery"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/client-go"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/kubelet"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/kubectl"
-      versions: [">=0.27.0"]
-- package-ecosystem: "gomod"
-  directory: "/azure-ipam"
-  schedule:
-    interval: "daily"
-  commit-message:
-    prefix: "deps"
-  labels: [ "dependencies", "azure-ipam", "release/1.4" ]
-  open-pull-requests-limit: 10
-  target-branch: "release/v1.4"
-  ignore:
-    - dependency-name: "k8s.io/api"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/apiextensions-apiserver"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/apimachinery"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/client-go"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/kubelet"
-      versions: [">=0.27.0"]
-    - dependency-name: "k8s.io/kubectl"
-      versions: [">=0.27.0"]

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

@@ -4,15 +4,15 @@ set -eux
 [[ $OS =~ windows ]] && { echo "azure-ip-masq-merger is not supported on Windows"; exit 1; }
 FILE_EXT=''
 
-export CGO_ENABLED=0 
+export CGO_ENABLED=0
 
 mkdir -p "$OUT_DIR"/bin
 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 "-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

@@ -3,15 +3,15 @@ set -eux
 
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
-export CGO_ENABLED=0 
+export CGO_ENABLED=0
 
 mkdir -p "$OUT_DIR"/bin
 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 "-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

@@ -6,14 +6,14 @@ set -eux
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
 
-export CGO_ENABLED=0 
+export CGO_ENABLED=0
 
 
 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 "-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 "-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 "-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 "-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 "-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

@@ -3,7 +3,7 @@ set -eux
 
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
-export CGO_ENABLED=0 
+export CGO_ENABLED=0
 
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
@@ -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 "-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

@@ -20,7 +20,7 @@ function files::remove_exe_extensions() {
 
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
-export CGO_ENABLED=0 
+export CGO_ENABLED=0
 
 mkdir -p "$GEN_DIR"
 mkdir -p "$OUT_DIR"/bin
@@ -40,11 +40,11 @@ pushd "$PAYLOAD_DIR"
   [[ -d "$OUT_DIR"/bin ]] && cp "$OUT_DIR"/bin/* . || true
 
   [[ $OS =~ windows ]] && files::remove_exe_extensions .
-  
+
   sha256sum * > sum.txt
   gzip --verbose --best --recursive .
 
-  for file in $(find . -name '*.gz'); do 
+  for file in $(find . -name '*.gz'); do
     mv "$file" "${file%%.gz}"
   done
 popd
@@ -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 "-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

@@ -37,7 +37,7 @@ function findcp::shared_library() {
 
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
-export CGO_ENABLED=0 
+export CGO_ENABLED=0
 export C_INCLUDE_PATH=/usr/include/bpf
 
 mkdir -p "$OUT_DIR"/bin
@@ -52,15 +52,15 @@ if [[ -f /etc/debian_version ]];then
 
     ARCH=x86_64-linux-gnu
     cp /usr/lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
-  
+
   elif [[ $ARCH =~ arm64 ]]; then
     apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu
 
     ARCH=aarch64-linux-gnu
     cp /usr/lib/"$ARCH"/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
   fi
 
-  for dir in /usr/include/"$ARCH"/*; do 
+  for dir in /usr/include/"$ARCH"/*; do
     ln -sfn "$dir" /usr/include/$(basename "$dir")
   done
 
@@ -101,14 +101,14 @@ else
     ARCH=aarch64-linux-gnu
     #tdnf install -y glibc-devel.i386
     if [[ -f '/usr/lib/ld-linux-aarch64.so.1' ]]; then
-      cp /usr/lib/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/ 
+      cp /usr/lib/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
     fi
   fi
-  for dir in /usr/include/"$ARCH"/*; do 
+  for dir in /usr/include/"$ARCH"/*; do
     if [[ -d $dir ]]; then
-      ln -sfn "$dir" /usr/include/$(basename "$dir") 
+      ln -sfn "$dir" /usr/include/$(basename "$dir")
     elif [[ -f "$dir" ]]; then
-      ln -Tsfn "$dir" /usr/include/$(basename "$dir") 
+      ln -Tsfn "$dir" /usr/include/$(basename "$dir")
     fi
   done
 
@@ -152,13 +152,13 @@ cp /sbin/ip "$OUT_DIR"/bin/ip"$FILE_EXT"
 pushd "$REPO_ROOT"/bpf-prog/ipv6-hp-bpf
   cp ./cmd/ipv6-hp-bpf/*.go .
 
-  if [[ "$DEBUG" =~ ^[T|t]rue$ ]]; then 
+  if [[ "$DEBUG" =~ ^[T|t]rue$ ]]; then
     echo -e "\n#define DEBUG" >> ./include/helper.h
   fi
 
   go generate ./...
   GOOS="$OS" go build -v -a -trimpath \
     -o "$OUT_DIR"/bin/ipv6-hp-bpf"$FILE_EXT" \
-    -ldflags "-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

@@ -3,7 +3,7 @@ set -eux
 
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
-export CGO_ENABLED=0 
+export CGO_ENABLED=0
 
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
@@ -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 "-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