chore(deps): update dependency volker.raschek/prometheus-fail2ban-exporter-charts to v0.4.8

.gitea/scripts/add-annotations.sh

@@ -4,12 +4,13 @@ set -e
 
 CHART_FILE="Chart.yaml"
 if [ ! -f "${CHART_FILE}" ]; then
-  echo "ERROR: ${CHART_FILE} not found!" 1>&2
+  echo "ERROR: ${CHART_FILE} not found!"
   exit 1
 fi
 
-DEFAULT_NEW_TAG="$(git tag --sort=-version:refname | head -n 1)"
-DEFAULT_OLD_TAG="$(git tag --sort=-version:refname | head -n 2 | tail -n 1)"
+
+DEFAULT_NEW_TAG="$(git describe --abbrev=0)"
+DEFAULT_OLD_TAG="$(git describe --abbrev=0 --tags "$(git rev-list --tags --skip=1 --max-count=1)")"
 
 if [ -z "${1}" ]; then
   read -p "Enter start tag [${DEFAULT_OLD_TAG}]: " OLD_TAG
@@ -18,7 +19,7 @@ if [ -z "${1}" ]; then
   fi
 
   while [ -z "$(git tag --list "${OLD_TAG}")" ]; do
-    echo "ERROR: Tag '${OLD_TAG}' not found!" 1>&2
+    echo "ERROR: Tag '${OLD_TAG}' not found!"
     read -p "Enter start tag [${DEFAULT_OLD_TAG}]: " OLD_TAG
     if [ -z "${OLD_TAG}" ]; then
       OLD_TAG="${DEFAULT_OLD_TAG}"
@@ -27,35 +28,34 @@ if [ -z "${1}" ]; then
 else
   OLD_TAG=${1}
   if [ -z "$(git tag --list "${OLD_TAG}")" ]; then
-    echo "ERROR: Tag '${OLD_TAG}' not found!" 1>&2
+    echo "ERROR: Tag '${OLD_TAG}' not found!"
     exit 1
   fi
 fi
 
-if [ -z "${2}" ]; then
+if [ -z "${1}" ]; then
   read -p "Enter end tag [${DEFAULT_NEW_TAG}]: " NEW_TAG
   if [ -z "${NEW_TAG}" ]; then
     NEW_TAG="${DEFAULT_NEW_TAG}"
   fi
 
   while [ -z "$(git tag --list "${NEW_TAG}")" ]; do
-    echo "ERROR: Tag '${NEW_TAG}' not found!" 1>&2
+    echo "ERROR: Tag '${NEW_TAG}' not found!"
     read -p "Enter end tag [${DEFAULT_NEW_TAG}]: " NEW_TAG
     if [ -z "${NEW_TAG}" ]; then
       NEW_TAG="${DEFAULT_NEW_TAG}"
     fi
   done
 else
-  NEW_TAG=${2}
+  NEW_TAG=${1}
 
   if [ -z "$(git tag --list "${NEW_TAG}")" ]; then
-    echo "ERROR: Tag '${NEW_TAG}' not found!" 1>&2
+    echo "ERROR: Tag '${NEW_TAG}' not found!"
     exit 1
   fi
 fi
 
-CHANGE_LOG_YAML=$(mktemp)
-echo "[]" > "${CHANGE_LOG_YAML}"
+YAML_FILE=$(mktemp)
 
 function map_type_to_kind() {
   case "${1}" in
@@ -80,35 +80,24 @@ function map_type_to_kind() {
   esac
 }
 
-COMMIT_TITLES="$(git log --pretty=format:"%s" "${OLD_TAG}..${NEW_TAG}")"
-
-echo "INFO: Generate change log entries from ${OLD_TAG} until ${NEW_TAG}"
+COMMIT_TITLES=$(git log "${OLD_TAG}..${NEW_TAG}" --pretty=format:"%s")
 
 while IFS= read -r line; do
   if [[ "${line}" =~ ^([a-zA-Z]+)(\([^\)]+\))?\:\ (.+)$ ]]; then
     TYPE="${BASH_REMATCH[1]}"
-    KIND=$(map_type_to_kind "${TYPE}")
 
-    if [ "${KIND}" == "skip" ]; then
+    if [ "${TYPE}" == "skip" ]; then
       continue
     fi
 
     DESC="${BASH_REMATCH[3]}"
+    KIND=$(map_type_to_kind "${TYPE}")
 
-    echo "- ${KIND}: ${DESC}"
-
-    jq --arg kind changed --arg description "$DESC" '. += [ $ARGS.named ]' < ${CHANGE_LOG_YAML} > ${CHANGE_LOG_YAML}.new
-    mv ${CHANGE_LOG_YAML}.new ${CHANGE_LOG_YAML}
-
+    yq --inplace ". += [ {\"kind\": \"${KIND}\", \"description\": \"${DESC}\"}]" "${YAML_FILE}"
   fi
 done <<< "${COMMIT_TITLES}"
 
-if [ -s "${CHANGE_LOG_YAML}" ]; then
-  yq --inplace --input-format json --output-format yml "${CHANGE_LOG_YAML}"
-  yq --no-colors --inplace ".annotations.\"artifacthub.io/changes\" |= loadstr(\"${CHANGE_LOG_YAML}\") | sort_keys(.)" "${CHART_FILE}"
-else
-  echo "ERROR: Changelog file is empty: ${CHANGE_LOG_YAML}" 1>&2
-  exit 1
-fi
+yq --no-colors --inplace ".annotations.\"artifacthub.io/changes\" |= loadstr(\"${YAML_FILE}\") | sort_keys(.)" "${CHART_FILE}"
+yq --no-colors --inplace ".version = \"${NEW_TAG}\"" "${CHART_FILE}"
 
-rm "${CHANGE_LOG_YAML}"
+rm "${YAML_FILE}"

.gitea/workflows/release.yaml

@@ -14,48 +14,42 @@ jobs:
       - name: Install tooling
         run: |
           apk update
-          apk add git npm jq yq
+          apk add git npm yq
 
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Add Artifacthub.io annotations
         run: |
-          NEW_TAG="$(git tag --sort=-version:refname | head -n 1)"
-          OLD_TAG="$(git tag --sort=-version:refname | head -n 2 | tail -n 1)"
+          git fetch --unshallow --tags --force
+
+          NEW_TAG="$(git describe --abbrev=0)"
+          OLD_TAG="$(git describe --abbrev=0 --tags "$(git rev-list --tags --skip=1 --max-count=1)")"
+
           .gitea/scripts/add-annotations.sh "${OLD_TAG}" "${NEW_TAG}"
 
-      - name: Extract meta information
-        run: |
-          echo "PACKAGE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-          echo "REPOSITORY_NAME=$(echo ${GITHUB_REPOSITORY} | cut -d '/' -f 2)" >> $GITHUB_ENV
-          echo "REPOSITORY_OWNER=$(echo ${GITHUB_REPOSITORY} | cut -d '/' -f 1)" >> $GITHUB_ENV
-
-      - name: Update Helm Chart version in README.md
-        run: sed -i -E "s/^CHART_VERSION=.*/CHART_VERSION=${PACKAGE_VERSION}/gm" README.md
-
       - name: Package chart
-        run: |
-          helm dependency build
-          helm package --version "${PACKAGE_VERSION}" ./
-
-      - name: Upload Chart to ChartMuseum
         env:
           CHARTMUSEUM_PASSWORD: ${{ secrets.CHARTMUSEUM_PASSWORD }}
           CHARTMUSEUM_REPOSITORY: ${{ vars.CHARTMUSEUM_REPOSITORY }}
           CHARTMUSEUM_USERNAME: ${{ secrets.CHARTMUSEUM_USERNAME }}
           CHARTMUSEUM_HOSTNAME: ${{ vars.CHARTMUSEUM_HOSTNAME }}
+
+          GITEA_PACKAGE_REGISTRY_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
+          GITEA_SERVER_URL: ${{ github.server_url }}
         run: |
+          PACKAGE_VERSION=${GITHUB_REF#refs/tags/}
+          REPOSITORY_NAME=$(echo ${GITHUB_REPOSITORY} | cut -d '/' -f 2 | sed --regexp-extended 's/-charts?//g')
+          REPOSITORY_OWNER=$(echo ${GITHUB_REPOSITORY} | cut -d '/' -f 1)
+
+          helm dependency build
+          helm package --version "${PACKAGE_VERSION}" ./
+
+          # chart-museum
           helm repo add --username ${CHARTMUSEUM_USERNAME} --password ${CHARTMUSEUM_PASSWORD} chartmuseum https://${CHARTMUSEUM_HOSTNAME}/${CHARTMUSEUM_REPOSITORY}
           helm cm-push ${REPOSITORY_NAME}-${PACKAGE_VERSION}.tgz chartmuseum
           helm repo remove chartmuseum
 
-      - name: Upload Chart to Gitea
-        env:
-          GITEA_PACKAGE_REGISTRY_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
-          GITEA_SERVER_URL: ${{ github.server_url }}
-        run: |
+          # gitea
           helm repo add --username ${REPOSITORY_OWNER} --password ${GITEA_PACKAGE_REGISTRY_TOKEN} gitea ${GITEA_SERVER_URL}/api/packages/${REPOSITORY_OWNER}/helm
           helm cm-push ${REPOSITORY_NAME}-${PACKAGE_VERSION}.tgz gitea
-          helm repo remove gitea
+          helm repo remove gitea

README.md

@@ -42,7 +42,7 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi
 versions can break something!
 
 ```bash
-CHART_VERSION=0.4.16
+CHART_VERSION=0.4.8
 helm show values prometheus-exporters/prometheus-fail2ban-exporter --version "${CHART_VERSION}" > values.yaml
 ```