From ab4fa4246797a33bc7b45b45097a91086fe9ad48 Mon Sep 17 00:00:00 2001
From: agile6v <agile6v@gmail.com>
Date: Sat, 13 Nov 2021 03:46:35 +0800
Subject: [PATCH] fix compling kubectl-ingress_nginx error and add some
 descriptions for build command. (#7903)

---
 build/build-plugin.sh | 10 +++++++---
 build/build.sh        | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build/build-plugin.sh b/build/build-plugin.sh
index 93b6efbdf..568451dc0 100755
--- a/build/build-plugin.sh
+++ b/build/build-plugin.sh
@@ -52,12 +52,14 @@ function build_for_arch(){
   arch=$2
   extension=$3
 
+  echo "> building targets for ${os}-${arch}"
+
   env GOOS="${os}" GOARCH="${arch}" go build \
-    "${GOBUILD_FLAGS}" \
-    -trimpath -ldflags="-buildid= -w -s" \
+    ${GOBUILD_FLAGS} \
+    -trimpath -ldflags="-buildid= -w -s \
       -X ${PKG}/version.RELEASE=${TAG} \
       -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
-      -X ${PKG}/version.REPO=${REPO_INFO} \
+      -X ${PKG}/version.REPO=${REPO_INFO}" \
     -o "${release}/kubectl-ingress_nginx${extension}" "${PKG}/cmd/plugin"
 
     cp LICENSE ${release}
@@ -74,6 +76,8 @@ cp cmd/plugin/ingress-nginx.yaml.tmpl "${release}/ingress-nginx.yaml"
 
 sed -i "s/%%%tag%%%/${TAG}/g" ${release}/ingress-nginx.yaml
 
+echo "Generated targets in ${release} directory."
+
 build_for_arch darwin amd64 ''
 build_for_arch linux amd64 ''
 build_for_arch windows amd64 '.exe'
diff --git a/build/build.sh b/build/build.sh
index 914716feb..9edae604d 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -46,23 +46,26 @@ fi
 export CGO_ENABLED=0
 export GOARCH=${ARCH}
 
-go build \
-  -trimpath -ldflags="-buildid= -w -s \
-    -X ${PKG}/version.RELEASE=${TAG} \
-    -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
-    -X ${PKG}/version.REPO=${REPO_INFO}" \
-  -o "rootfs/bin/${ARCH}/nginx-ingress-controller" "${PKG}/cmd/nginx"
+TARGETS_DIR="rootfs/bin/${ARCH}"
+echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} directory."
 
 go build \
   -trimpath -ldflags="-buildid= -w -s \
     -X ${PKG}/version.RELEASE=${TAG} \
     -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
     -X ${PKG}/version.REPO=${REPO_INFO}" \
-  -o "rootfs/bin/${ARCH}/dbg" "${PKG}/cmd/dbg"
+  -o "${TARGETS_DIR}/nginx-ingress-controller" "${PKG}/cmd/nginx"
 
 go build \
   -trimpath -ldflags="-buildid= -w -s \
     -X ${PKG}/version.RELEASE=${TAG} \
     -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
     -X ${PKG}/version.REPO=${REPO_INFO}" \
-  -o "rootfs/bin/${ARCH}/wait-shutdown" "${PKG}/cmd/waitshutdown"
+  -o "${TARGETS_DIR}/dbg" "${PKG}/cmd/dbg"
+
+go build \
+  -trimpath -ldflags="-buildid= -w -s \
+    -X ${PKG}/version.RELEASE=${TAG} \
+    -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
+    -X ${PKG}/version.REPO=${REPO_INFO}" \
+  -o "${TARGETS_DIR}/wait-shutdown" "${PKG}/cmd/waitshutdown"