DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix compling kubectl-ingress_nginx error and add some descriptions for build command. (#7903)

Browse source
This commit is contained in:
agile6v 2021-11-13 03:46:35 +08:00 committed by GitHub
parent 7203a0b8bd
commit ab4fa42467
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/build-plugin.sh
View file

@ -52,12 +52,14 @@ function build_for_arch(){
arch=$2 arch=$2
extension=$3 extension=$3
echo "> building targets for ${os}-${arch}"
env GOOS="${os}" GOARCH="${arch}" go build \ env GOOS="${os}" GOARCH="${arch}" go build \
"${GOBUILD_FLAGS}" \ ${GOBUILD_FLAGS} \
-trimpath -ldflags="-buildid= -w -s" \ -trimpath -ldflags="-buildid= -w -s \
-X ${PKG}/version.RELEASE=${TAG} \ -X ${PKG}/version.RELEASE=${TAG} \
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \ -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" -o "${release}/kubectl-ingress_nginx${extension}" "${PKG}/cmd/plugin"
cp LICENSE ${release} 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 sed -i "s/%%%tag%%%/${TAG}/g" ${release}/ingress-nginx.yaml
echo "Generated targets in ${release} directory."
build_for_arch darwin amd64 '' build_for_arch darwin amd64 ''
build_for_arch linux amd64 '' build_for_arch linux amd64 ''
build_for_arch windows amd64 '.exe' build_for_arch windows amd64 '.exe'

19
build/build.sh
View file

@ -46,23 +46,26 @@ fi
export CGO_ENABLED=0 export CGO_ENABLED=0
export GOARCH=${ARCH} export GOARCH=${ARCH}
go build \ TARGETS_DIR="rootfs/bin/${ARCH}"
-trimpath -ldflags="-buildid= -w -s \ echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} directory."
-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"
go build \ go build \
-trimpath -ldflags="-buildid= -w -s \ -trimpath -ldflags="-buildid= -w -s \
-X ${PKG}/version.RELEASE=${TAG} \ -X ${PKG}/version.RELEASE=${TAG} \
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \ -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
-X ${PKG}/version.REPO=${REPO_INFO}" \ -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 \ go build \
-trimpath -ldflags="-buildid= -w -s \ -trimpath -ldflags="-buildid= -w -s \
-X ${PKG}/version.RELEASE=${TAG} \ -X ${PKG}/version.RELEASE=${TAG} \
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \ -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
-X ${PKG}/version.REPO=${REPO_INFO}" \ -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"