docs(README): add CHART_VERSION

.gitea/scripts/add-annotations.sh

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

.gitea/workflows/generate-readme.yaml

@@ -15,7 +15,7 @@ on:
 jobs:
   generate-parameters:
     container:
-      image: docker.io/library/node:24.1.0-alpine
+      image: docker.io/library/node:24.4.1-alpine
     runs-on:
     - ubuntu-latest
     steps:

.gitea/workflows/helm.yaml

@@ -13,7 +13,7 @@ on:
 jobs:
   helm-lint:
     container:
-      image: docker.io/volkerraschek/helm:3.18.2
+      image: docker.io/volkerraschek/helm:3.18.4
     runs-on:
     - ubuntu-latest
     steps:
@@ -28,7 +28,7 @@ jobs:
 
   helm-unittest:
     container:
-      image: docker.io/volkerraschek/helm:3.18.2
+      image: docker.io/volkerraschek/helm:3.18.4
     runs-on:
     - ubuntu-latest
     steps:

.gitea/workflows/markdown-linters.yaml

@@ -15,7 +15,7 @@ on:
 jobs:
   markdown-link-checker:
     container:
-      image: docker.io/library/node:24.1.0-alpine
+      image: docker.io/library/node:24.4.1-alpine
     runs-on:
     - ubuntu-latest
     steps:
@@ -31,7 +31,7 @@ jobs:
 
   markdown-lint:
     container:
-      image: docker.io/library/node:24.1.0-alpine
+      image: docker.io/library/node:24.4.1-alpine
     runs-on:
     - ubuntu-latest
     steps:

.gitea/workflows/release.yaml

@@ -2,21 +2,19 @@ name: Release
 
 on:
   push:
-    branches:
-    - master
     tags:
     - "**"
 
 jobs:
   publish-chart:
     container:
-      image: docker.io/volkerraschek/helm:3.18.2
+      image: docker.io/volkerraschek/helm:3.18.4
     runs-on: ubuntu-latest
     steps:
-      - name: Install tooling
+      - name: Install packages via apk
         run: |
           apk update
-          apk add git npm yq
+          apk add git npm jq yq
 
       - uses: actions/checkout@v4
         with:
@@ -24,36 +22,40 @@ jobs:
 
       - name: Add Artifacthub.io annotations
         run: |
-          git tag
-
-          NEW_TAG="$(git describe --abbrev=0)"
-          OLD_TAG="$(git describe --abbrev=0 --tags "$(git rev-list --tags --skip=1 --max-count=1)")"
-
+          NEW_TAG="$(git tag --sort=-version:refname | head -n 1)"
+          OLD_TAG="$(git tag --sort=-version:refname | head -n 2 | tail -n 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 | sed --regexp-extended 's/-charts?//g')" >> $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}/g" 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
 
-          # gitea
+      - name: Upload Chart to Gitea
+        env:
+          GITEA_PACKAGE_REGISTRY_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
+          GITEA_SERVER_URL: ${{ github.server_url }}
+        run: |
           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

.vscode/settings.json

@@ -1,8 +0,0 @@
-{
-  "yaml.schemas": {
-    "https://raw.githubusercontent.com/helm-unittest/helm-unittest/v0.5.2/schema/helm-testsuite.json": [
-      "/unittests/**/*.yaml"
-    ]
-  },
-  "yaml.schemaStore.enable": true
-}

Makefile

@@ -4,13 +4,13 @@ CONTAINER_RUNTIME?=$(shell which podman)
 # HELM_IMAGE
 HELM_IMAGE_REGISTRY_HOST?=docker.io
 HELM_IMAGE_REPOSITORY?=volkerraschek/helm
-HELM_IMAGE_VERSION?=3.18.2 # renovate: datasource=docker registryUrl=https://docker.io depName=volkerraschek/helm
+HELM_IMAGE_VERSION?=3.18.4 # renovate: datasource=docker registryUrl=https://docker.io depName=volkerraschek/helm
 HELM_IMAGE_FULLY_QUALIFIED=${HELM_IMAGE_REGISTRY_HOST}/${HELM_IMAGE_REPOSITORY}:${HELM_IMAGE_VERSION}
 
 # NODE_IMAGE
 NODE_IMAGE_REGISTRY_HOST?=docker.io
 NODE_IMAGE_REPOSITORY?=library/node
-NODE_IMAGE_VERSION?=24.1.0-alpine # renovate: datasource=docker registryUrl=https://docker.io depName=docker.io/library/node packageName=library/node
+NODE_IMAGE_VERSION?=24.4.1-alpine # renovate: datasource=docker registryUrl=https://docker.io depName=docker.io/library/node packageName=library/node
 NODE_IMAGE_FULLY_QUALIFIED=${NODE_IMAGE_REGISTRY_HOST}/${NODE_IMAGE_REPOSITORY}:${NODE_IMAGE_VERSION}
 
 # MISSING DOT

README.md

@@ -31,7 +31,8 @@ helm chart is tested for deployment scenarios with **ArgoCD**.
 ```bash
 helm repo add prometheus-exporters https://charts.cryptic.systems/prometheus-exporters
 helm repo update
-helm install prometheus-fail2ban-exporter prometheus-exporters/prometheus-fail2ban-exporter \
+CHART_VERSION=0.4.21
+helm install --version "${CHART_VERSION}" prometheus-fail2ban-exporter prometheus-exporters/prometheus-fail2ban-exporter \
   --set 'prometheus.metrics.enabled=true' \
   --set 'prometheus.metrics.serviceMonitor.enabled=true'
 ```
@@ -42,8 +43,8 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi
 versions can break something!
 
 ```bash
-CHART_VERSION=0.4.11
-helm show values prometheus-exporters/prometheus-fail2ban-exporter --version "${CHART_VERSION}" > values.yaml
+CHART_VERSION=0.4.21
+helm show values --version "${CHART_VERSION}" prometheus-exporters/prometheus-fail2ban-exporter > values.yaml
 ```
 
 A complete list of available helm chart versions can be displayed via the following command:
@@ -80,7 +81,8 @@ Further information about this topic can be found in one of Kanishk's blog
 > Please take care the a CPU limit < `1000m` can also lead to CPU throttling. Please read the linked documentation carefully.
 
 ```bash
-helm install prometheus-fail2ban-exporter prometheus-exporters/prometheus-fail2ban-exporter \
+CHART_VERSION=0.4.21
+helm install --version "${CHART_VERSION}" prometheus-fail2ban-exporter prometheus-exporters/prometheus-fail2ban-exporter \
   --set 'prometheus.metrics.enabled=true' \
   --set 'prometheus.metrics.serviceMonitor.enabled=true' \
   --set 'daemonSet.fail2banExporter.env.name=GOMAXPROCS' \
@@ -144,7 +146,8 @@ the Grafana container file system so that it is subsequently available to the us
 makes this possible.
 
 ```bash
-helm install prometheus-fail2ban-exporter prometheus-exporters/prometheus-fail2ban-exporter \
+CHART_VERSION=0.4.21
+helm install --version "${CHART_VERSION}" prometheus-fail2ban-exporter prometheus-exporters/prometheus-fail2ban-exporter \
   --set 'grafana.enabled=true'
 ```
 

package-lock.json

@@ -17,9 +17,9 @@
       }
     },
     "node_modules/@bitnami/readme-generator-for-helm": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@bitnami/readme-generator-for-helm/-/readme-generator-for-helm-2.7.0.tgz",
-      "integrity": "sha512-fVxExmcuJ9NZb9ZE9OW3+lG8pUlXJAJdaO8UukV3A7WzYu4qOTr03MXPH9Gt5e/6mo3x4WYI/cXBksKfS0qn3w==",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/@bitnami/readme-generator-for-helm/-/readme-generator-for-helm-2.7.2.tgz",
+      "integrity": "sha512-7eXyJzxQTQj2ajpHlIhadciCCYWOqN8ieaweU25bStHOZowQ2c2CQyjO/bX4gxIf73LoRKxHhEYgLTllJY9SIw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {

renovate.json

@@ -23,7 +23,7 @@
     {
       "fileMatch": ["^README\\.md$"],
       "matchStrings": [
-        "VERSION=(?<currentValue>.*)"
+        "CHART_VERSION=(?<currentValue>.*)"
       ],
       "depNameTemplate": "volker.raschek/prometheus-fail2ban-exporter-charts",
       "packageNameTemplate": "https://git.cryptic.systems/volker.raschek/prometheus-fail2ban-exporter-charts",

templates/_pod.tpl

@@ -16,7 +16,7 @@
 {{- $secret := default (dict "data" (dict)) (lookup "v1" "Secret" .Release.Namespace .Values.config.webConfig.existingSecret.secretName ) }}
 checksum/secret-web-config: {{ print $secret.spec | sha256sum }}
 {{- else }}
-checksum/secret-web-config: {{ include (print $.Template.BasePath "/prometheus-fail2ban-exporter/secretWebConfig.yaml") . | sha256sum }}
+checksum/secret-web-config: {{ include (print $.Template.BasePath "/secretWebConfig.yaml") . | sha256sum }}
 {{- end }}
 
 {{- end }}

unittests/configMaps/grafanaDashboardPostgresExporter.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/configMapGrafanaDashboardFail2BanExporter.yaml
+- templates/configMapGrafanaDashboardFail2BanExporter.yaml
 tests:
 - it: Rendering fail2banExporter
   asserts:

unittests/daemonset/daemonset.yaml

@@ -6,23 +6,23 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/daemonSet.yaml
-- templates/prometheus-fail2ban-exporter/secretWebConfig.yaml
+- templates/daemonSet.yaml
+- templates/secretWebConfig.yaml
 tests:
 - it: Rendering default
   asserts:
   - hasDocuments:
       count: 1
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - containsDocument:
       apiVersion: apps/v1
       kind: DaemonSet
       name: prometheus-fail2ban-exporter-unittest
       namespace: testing
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: metadata.annotations
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: metadata.labels
       value:
@@ -31,10 +31,10 @@ tests:
         app.kubernetes.io/name: prometheus-fail2ban-exporter
         app.kubernetes.io/version: 0.1.0
         helm.sh/chart: prometheus-fail2ban-exporter-0.1.0
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - exists:
       path: spec.template.metadata.annotations.checksum/secret-web-config
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.metadata.labels
       value:
@@ -43,19 +43,19 @@ tests:
         app.kubernetes.io/name: prometheus-fail2ban-exporter
         app.kubernetes.io/version: 0.1.0
         helm.sh/chart: prometheus-fail2ban-exporter-0.1.0
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.affinity
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.containers[0].envFrom
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.containers[0].args
       value:
       # - --web.config.file=/etc/prometheus-fail2ban-exporter/config.d/webConfig.yaml
       - --web.listen-address=:9191
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.containers[0].volumeMounts
       value:
@@ -63,7 +63,7 @@ tests:
         name: socket
       - mountPath: /etc/prometheus-fail2ban-exporter/config.d
         name: config-d
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.volumes
       value:
@@ -74,59 +74,59 @@ tests:
       - name: config-d
         secret:
           secretName: prometheus-fail2ban-exporter-unittest-web-config
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.containers[0].image
       value: git.cryptic.systems/volker.raschek/prometheus-fail2ban-exporter:0.1.0
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.containers[0].imagePullPolicy
       value: IfNotPresent
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.containers[0].resources
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.containers[0].securityContext
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.dnsConfig
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.dnsPolicy
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.hostname
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.hostNetwork
       value: false
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.imagePullSecrets
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.nodeSelector
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.priorityClassName
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.restartPolicy
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.subdomain
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.terminationGracePeriodSeconds
       value: 60
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.tolerations
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - notExists:
       path: spec.template.spec.topologySpreadConstraints
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.updateStrategy
       value:
@@ -134,7 +134,7 @@ tests:
           maxSurge: 1
           maxUnavailable: 0
         type: "RollingUpdate"
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test custom affinity
   set:
@@ -161,7 +161,7 @@ tests:
                 values:
                 - antarctica-east1
                 - antarctica-west1
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test additional arguments
   set:
@@ -176,7 +176,7 @@ tests:
       - --web.listen-address=:9191
       - --foo=bar
       - --bar=foo
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test custom imageRegistry and imageRepository
   set:
@@ -186,7 +186,7 @@ tests:
   - equal:
       path: spec.template.spec.containers[0].image
       value: registry.example.local/path/special/prometheus-fail2ban-exporter:0.1.0
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test custom imagePullPolicy
   set:
@@ -195,7 +195,7 @@ tests:
   - equal:
       path: spec.template.spec.containers[0].imagePullPolicy
       value: Always
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test config.webConfig.existingSecret
   set:
@@ -209,7 +209,7 @@ tests:
         name: socket
       - mountPath: /etc/prometheus-fail2ban-exporter/config.d
         name: config-d
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.volumes
       value:
@@ -220,7 +220,7 @@ tests:
       - name: config-d
         secret:
           secretName: web-config-secret
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test custom resource limits and requests
   set:
@@ -240,7 +240,7 @@ tests:
           resourceFieldRef:
             divisor: "1"
             resource: limits.cpu
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.containers[0].resources
       value:
@@ -250,7 +250,7 @@ tests:
         requests:
           cpu: 25m
           memory: 100MB
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test custom securityContext
   set:
@@ -277,7 +277,7 @@ tests:
         readOnlyRootFilesystem: true
         runAsNonRoot: true
         runAsUser: 1000
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test dnsConfig
   set:
@@ -292,7 +292,7 @@ tests:
         nameservers:
         - "8.8.8.8"
         - "8.8.4.4"
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test dnsPolicy
   set:
@@ -301,7 +301,7 @@ tests:
   - equal:
       path: spec.template.spec.dnsPolicy
       value: ClusterFirst
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test hostNetwork, hostname, subdomain
   set:
@@ -312,15 +312,15 @@ tests:
   - equal:
       path: spec.template.spec.hostNetwork
       value: true
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.hostname
       value: pg-exporter
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.subdomain
       value: exporters.internal
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test imagePullSecrets
   set:
@@ -333,7 +333,7 @@ tests:
       value:
       - name: my-pull-secret
       - name: my-special-secret
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test nodeSelector
   set:
@@ -344,7 +344,7 @@ tests:
       path: spec.template.spec.nodeSelector
       value:
         foo: bar
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test priorityClassName
   set:
@@ -353,7 +353,7 @@ tests:
   - equal:
       path: spec.template.spec.priorityClassName
       value: my-priority
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test restartPolicy
   set:
@@ -362,7 +362,7 @@ tests:
   - equal:
       path: spec.template.spec.restartPolicy
       value: Always
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test terminationGracePeriodSeconds
   set:
@@ -371,7 +371,7 @@ tests:
   - equal:
       path: spec.template.spec.terminationGracePeriodSeconds
       value: 120
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test tolerations
   set:
@@ -388,7 +388,7 @@ tests:
         operator: Equal
         value: fail2ban
         effect: NoSchedule
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test topologySpreadConstraints
   set:
@@ -407,7 +407,7 @@ tests:
         labelSelector:
           matchLabels:
             app.kubernetes.io/instance: prometheus-fail2ban-exporter
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
 
 - it: Test additional volumeMounts and volumes
   set:
@@ -426,7 +426,7 @@ tests:
         mountPath: /usr/lib/prometheus-fail2ban-exporter/data
       - name: config-d
         mountPath: /etc/prometheus-fail2ban-exporter/config.d
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml
   - equal:
       path: spec.template.spec.volumes
       value:
@@ -436,4 +436,4 @@ tests:
       - name: config-d
         secret:
           secretName: prometheus-fail2ban-exporter-unittest-web-config
-    template: templates/prometheus-fail2ban-exporter/daemonSet.yaml
+    template: templates/daemonSet.yaml

unittests/ingress/ingress.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/ingress.yaml
+- templates/ingress.yaml
 tests:
 - it: Skip ingress by default.
   asserts:

unittests/networkPolicies/default.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/networkPolicies.yaml
+- templates/networkPolicies.yaml
 tests:
 - it: Skip networkPolicies in general disabled.
   set:

unittests/podMonitors/podMonitorHTTP.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/podMonitor.yaml
+- templates/podMonitor.yaml
 tests:
 - it: Skip podMonitor when metrics are disabled.
   set:

unittests/secrets/webconfig.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/secretWebConfig.yaml
+- templates/secretWebConfig.yaml
 tests:
 - it: Rendering default secret.
   asserts:

unittests/serviceAccounts/serviceAccount.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/serviceAccount.yaml
+- templates/serviceAccount.yaml
 tests:
 - it: Skip rendering.
   set:

unittests/serviceMonitors/serviceMonitorHTTP.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/serviceMonitorHTTP.yaml
+- templates/serviceMonitorHTTP.yaml
 tests:
 - it: Skip serviceMonitor when service is disabled.
   set:

unittests/services/http.yaml

@@ -6,7 +6,7 @@ release:
   name: prometheus-fail2ban-exporter-unittest
   namespace: testing
 templates:
-- templates/prometheus-fail2ban-exporter/serviceHTTP.yaml
+- templates/serviceHTTP.yaml
 tests:
 - it: Skip service when disabled.
   set: