Merge pull request #8 from fullstack-devops/feature/show-logs-k8s

fix for logs in k8s

Author: eksrha

.github/workflows/pr-build.yaml

@@ -131,9 +131,6 @@ jobs:
         env: #ACI_ARTIFACT_1_URL
           GITHUB_TOKEN: ${{ secrets.HELM_REPO_TOKEN }}
         run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "[email protected]"
-
           helm repo index out/ --url "$ACI_ARTIFACT_1_URL" --merge helm-charts/index.yaml
           cp -f out/index.yaml helm-charts/index.yaml
 

.github/workflows/release.yaml

@@ -92,9 +92,9 @@ jobs:
           cache-name: cache-outputs-modules
         with:
           path: out/
-          key: dns-bind-${{ github.event.pull_request.head.sha }}-${{ hashFiles('out/dns-bind*') }}
+          key: dns-bind-${{ github.sha }}-${{ hashFiles('out/dns-bind*') }}
           restore-keys: |
-            dns-bind-${{ github.event.pull_request.head.sha }}
+            dns-bind-${{ github.sha }}
 
   publish_release:
     runs-on: ubuntu-latest
@@ -111,7 +111,7 @@ jobs:
           cache-name: cache-outputs-modules
         with:
           path: out/
-          key: dns-bind-${{ github.event.pull_request.head.sha }}
+          key: dns-bind-${{ github.sha }}
 
       - name: Check out helm-charts
         uses: actions/checkout@v2
@@ -131,7 +131,7 @@ jobs:
 
       - name: Helm index
         env:
-          CHART_URL: "https://github.com/${{ github.repository }}/releases/download/${{ needs.generate_infos.outputs.version }}/dns-bind-${{ needs.generate_infos.outputs.version }}.tgz"
+          CHART_URL: "https://github.com/${{ github.repository }}/releases/download/${{ needs.generate_infos.outputs.version }}"
         run: |
           export
           helm repo index out/ --url "$CHART_URL" --merge helm-charts/index.yaml

docker-image/docker-entrypoint.sh

@@ -49,26 +49,20 @@ log() {
 	local message="${2}"  # msg to print
 	local debug="${3}"    # 0: only warn and error, >0: ok and info
 
-	local clr_ok="\033[0;32m"
-	local clr_info="\033[0;34m"
-	local clr_warn="\033[0;33m"
-	local clr_err="\033[0;31m"
-	local clr_rst="\033[0m"
-
 	if [ "${type}" = "ok" ]; then
 		if [ "${debug}" -gt "0" ]; then
-			printf "${clr_ok}[OK]   %s${clr_rst}\n" "${message}" 1>&2
+			echo "[OK]   ${message}"
 		fi
 	elif [ "${type}" = "info" ]; then
 		if [ "${debug}" -gt "0" ]; then
-			printf "${clr_info}[INFO] %s${clr_rst}\n" "${message}" 1>&2
+			echo "[INFO] ${message}"
 		fi
 	elif [ "${type}" = "warn" ]; then
-		printf "${clr_warn}[WARN] %s${clr_rst}\n" "${message}" 1>&2	# stdout -> stderr
+		echo "[WARN] ${message}"
 	elif [ "${type}" = "err" ]; then
-		printf "${clr_err}[ERR]  %s${clr_rst}\n" "${message}" 1>&2	# stdout -> stderr
+		echo "[ERR]  ${message}"
 	else
-		printf "${clr_err}[???]  %s${clr_rst}\n" "${message}" 1>&2	# stdout -> stderr
+		echo "[???]  ${message}"
 	fi
 }