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

Merge pull request #9106 from strongjz/remove-vcs

Browse source 
remove vcs build and resolve git issues
This commit is contained in:
James Strong 2022-09-30 13:11:13 -04:00 committed by GitHub
commit e7640a321c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TAG
View file

@ -1 +1 @@
v1.4.0 v1.3.1

7
build/build.sh
View file

@ -49,15 +49,12 @@ echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} director
echo "Building ${PKG}/cmd/nginx" echo "Building ${PKG}/cmd/nginx"
pushd /go/src/k8s.io/ingress-nginx
git config --add safe.directory /go/src/k8s.io/ingress-nginx
popd
${GO_BUILD_CMD} \ ${GO_BUILD_CMD} \
-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}" \
-buildvcs=false \
-o "${TARGETS_DIR}/nginx-ingress-controller" "${PKG}/cmd/nginx" -o "${TARGETS_DIR}/nginx-ingress-controller" "${PKG}/cmd/nginx"
echo "Building ${PKG}/cmd/dbg" echo "Building ${PKG}/cmd/dbg"
@ -67,6 +64,7 @@ ${GO_BUILD_CMD} \
-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}" \
-buildvcs=false \
-o "${TARGETS_DIR}/dbg" "${PKG}/cmd/dbg" -o "${TARGETS_DIR}/dbg" "${PKG}/cmd/dbg"
echo "Building ${PKG}/cmd/waitshutdown" echo "Building ${PKG}/cmd/waitshutdown"
@ -76,4 +74,5 @@ ${GO_BUILD_CMD} \
-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}" \
-buildvcs=false \
-o "${TARGETS_DIR}/wait-shutdown" "${PKG}/cmd/waitshutdown" -o "${TARGETS_DIR}/wait-shutdown" "${PKG}/cmd/waitshutdown"