Adjust build paths to not overlap

Author: mallardduck

.gitignore

@@ -1,5 +1,6 @@
 /.cache
 /bin
+/build
 /dist
 *.swp
 .idea

docs/developing.md

@@ -102,7 +102,7 @@ If you don't want to run all the steps in CI every time you make a change, you c
 REPO=<my-repo>
 TAG=<my-tag>
 
-./scripts/build-chart && GOOS=linux CGO_ENABLED=0 go build -ldflags "-extldflags -static -s" -o bin/prometheus-federator && REPO=${REPO} TAG=${TAG} make package
+./scripts/build-chart && GOOS=linux CGO_ENABLED=0 go build -ldflags "-extldflags -static -s" -o build/bin/prometheus-federator && REPO=${REPO} TAG=${TAG} make package
 ```
 
 Once the image is successfully packaged, simply run `docker push ${REPO}/prometheus-federator:${TAG}` to push your image to your Docker repository.

main.go

@@ -29,7 +29,7 @@ var (
 	// SystemNamespaces is the system namespaces scoped for the embedded monitoring chart (rancher-project-monitoring)
 	SystemNamespaces = []string{"kube-system", "cattle-monitoring-system", "cattle-dashboards"}
 
-	//go:embed bin/rancher-project-monitoring/rancher-project-monitoring.tgz.base64
+	//go:embed build/chart/rancher-project-monitoring.tgz.base64
 	base64TgzChart string
 
 	debugConfig command.DebugConfig

package/Dockerfile

@@ -40,6 +40,6 @@ RUN echo 'prometheus:x:1000:1000::/home/prometheus:/bin/bash' >> /etc/passwd &&
     mkdir /home/prometheus && \
     chown -R prometheus:prometheus /home/prometheus
 COPY --from=helm ./helm/bin/helm /usr/local/bin/
-COPY --from=builder /usr/src/app/bin/prometheus-federator /usr/bin/
+COPY --from=builder /usr/src/app/build/bin/prometheus-federator /usr/bin/
 USER prometheus
 CMD ["prometheus-federator"]

scripts/build

@@ -9,7 +9,7 @@ cd $(dirname $0)/..
 
 echo "Starting \`prometheus-federator\` binary build:";
 
-mkdir -p bin
+mkdir -p build/bin
 if [ "$(uname)" = "Linux" ]; then
     OTHER_LINKFLAGS="-extldflags -static -s"
 fi
@@ -30,18 +30,18 @@ fi
 echo "Building for Arch(s): ${ARCHES[*]}"
 
 for A in "${ARCHES[@]}" ; do
-  GOARCH="$A" CGO_ENABLED=0 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o "bin/prometheus-federator-$A"
+  GOARCH="$A" CGO_ENABLED=0 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o "build/bin/prometheus-federator-$A"
   # Set CROSS to build for other OS'es
   if [ "$CROSS" = "true" ]; then
     for OS in darwin windows ; do
-          GOARCH="$A" GOOS=$OS go build -ldflags "$LINKFLAGS" -o "bin/prometheus-federator-$OS-$A"
+          GOARCH="$A" GOOS=$OS go build -ldflags "$LINKFLAGS" -o "build/bin/prometheus-federator-$OS-$A"
           echo "Built \`prometheus-federator-$OS-$A\`"
     done
   fi
 done
 
-cd bin
+cd build/bin
 ln -sf "./prometheus-federator-$ARCH" "./prometheus-federator"
-cd ..
+cd ../..
 
 echo "Completed \`prometheus-federator\` binary build."

scripts/build-chart

@@ -8,8 +8,10 @@ cd $(dirname $0)/..
 CHART=${CHART:-rancher-project-monitoring}
 VERSION=${EMBEDED_CHART_VERSION:-$(find ./charts/${CHART} -maxdepth 1 -mindepth 1 -type d | tr - \~ | sort -rV | tr \~ - | head -n1 | cut -d'/' -f4)}
 
-helm package charts/${CHART}/${VERSION} --destination bin/${CHART}
-base64 -i bin/${CHART}/${CHART}-${VERSION}.tgz > bin/${CHART}/${CHART}.tgz.base64
-rm bin/${CHART}/${CHART}-${VERSION}.tgz
+mkdir -p build/bin
+
+helm package charts/${CHART}/${VERSION} --destination build/chart
+base64 -i build/chart/${CHART}-${VERSION}.tgz > build/chart/${CHART}.tgz.base64
+rm build/chart/${CHART}-${VERSION}.tgz
 
 echo "Completed ${CHART} (${VERSION}) build process."

scripts/package

@@ -8,7 +8,7 @@ cd $(dirname $0)/..
 echo "Starting \`prometheus-federator\` packaging:";
 
 mkdir -p dist/artifacts
-cp bin/prometheus-federator dist/artifacts/prometheus-federator${SUFFIX}
+cp build/bin/prometheus-federator dist/artifacts/prometheus-federator${SUFFIX}
 
 IMAGE=${REPO}/prometheus-federator:${TAG}
 DOCKERFILE=package/Dockerfile