fix(serviceAccount): remove top level dict .spec

.drone.yml

@@ -0,0 +1,208 @@
+---
+kind: pipeline
+type: kubernetes
+name: Linters
+
+clone:
+  disable: true
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: clone repository
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
+- name: helm lint
+  commands:
+  - helm lint
+  image: git.cryptic.systems/volker.raschek/helm:3.16.1
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+
+- name: markdown lint
+  commands:
+  - markdownlint *.md
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.41.0
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  event:
+    exclude:
+    - tag
+
+---
+kind: pipeline
+type: kubernetes
+name: Unit tests
+
+clone:
+  disable: true
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: clone repository
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
+- name: helm unittest
+  commands:
+  - helm unittest --strict --file 'unittests/**/*.yaml' ./
+  image: git.cryptic.systems/volker.raschek/helm:3.16.1
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  event:
+    exclude:
+    - tag
+
+---
+kind: pipeline
+type: kubernetes
+name: Generate README.md
+
+clone:
+  disable: true
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: clone repository
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
+- name: generate README
+  commands:
+  - npm install
+  - npm run readme:parameters
+  - npm run readme:lint
+  image: docker.io/library/node:22.9.0-alpine
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+
+- name: detect diff
+  commands:
+  - git diff --exit-code --name-only README.md
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  event:
+    exclude:
+    - tag
+
+---
+kind: pipeline
+type: kubernetes
+name: Release
+
+clone:
+  disable: true
+
+platform:
+  os: linux
+
+steps:
+- name: clone repository
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
+- name: release-helm-chart
+  commands:
+  - helm repo add prometheus-exporters https://charts.cryptic.systems/prometheus-exporters
+  - helm package --version ${DRONE_TAG} .
+  - helm cm-push ${DRONE_REPO_NAME}-${DRONE_TAG}.tgz prometheus-exporters
+  environment:
+    HELM_REPO_PASSWORD:
+      from_secret: helm_repo_password
+    HELM_REPO_USERNAME:
+      from_secret: helm_repo_username
+  image: git.cryptic.systems/volker.raschek/helm:3.16.1
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/prometheus-postgres-exporter

Chart.yaml

@@ -10,8 +10,9 @@ appVersion: "0.15.0"
 
 keywords:
 - prometheus
-- prometheus exporter
+- prometheus-exporter
-- postgres
+- postgres-postgres-exporter
+- postgres-exporter
 
 sources:
 - https://github.com/prometheus-community/postgres_exporter

README.md

@@ -1,5 +1,7 @@
 # Prometheus PostgreSQL exporter
 
+[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/prometheus-postgres-exporter/status.svg)](https://drone.cryptic.systems/volker.raschek/prometheus-postgres-exporter)
+
 This helm chart enables the deployment of a Prometheus metrics exporter for PostgreSQL databases and allows the
 individual configuration of additional containers/initContainers, mounting of volumes, defining additional environment
 variables, apply a user-defined web-config.yaml and much more.
@@ -27,9 +29,9 @@ chart is tested for deployment scenarios with ArgoCD.
 > time is not possible.
 
 ```bash
-helm repo add prometheus-exporter https://charts.cryptic.systems/prometheus-exporter
+helm repo add prometheus-exporters https://charts.cryptic.systems/prometheus-exporters
 helm repo update
-helm install prometheus-exporter/prometheus-postgres-exporter prometheus-postgres-exporter \
+helm install prometheus-exporters/prometheus-postgres-exporter prometheus-postgres-exporter \
   --set 'config.database.secret.databaseUsername=postgres' \
   --set 'config.database.secret.databasePassword=postgres' \
   --set 'config.database.secret.databaseConnectionUrl="postgres.example.local:5432/postgres?ssl=disable"' \
@@ -43,7 +45,7 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi
 versions can break something!
 
 ```bash
-helm show values prometheus-exporter/prometheus-postgres-exporter --version 0.1.0 > values.yaml
+helm show values prometheus-exporters/prometheus-postgres-exporter --version 0.1.0 > values.yaml
 ```
 
 A complete list of available helm chart versions can be displayed via the following command:
@@ -69,7 +71,7 @@ certification will be skipped by Prometheus.
 > already present.
 
 ```bash
-helm install prometheus-exporter/prometheus-postgres-exporter prometheus-postgres-exporter \
+helm install prometheus-exporters/prometheus-postgres-exporter prometheus-postgres-exporter \
   --set 'config.database.secret.databaseUsername=postgres' \
   --set 'config.database.secret.databasePassword=postgres' \
   --set 'config.database.secret.databaseConnectionUrl="postgres.example.local:5432/postgres?ssl=disable"' \
@@ -92,7 +94,7 @@ certificate for the metrics exporter - TLS certificate verification can be enabl
 replaced:
 
 ```diff
-  helm install prometheus-exporter/prometheus-postgres-exporter prometheus-postgres-exporter \
+  helm install prometheus-exporters/prometheus-postgres-exporter prometheus-postgres-exporter \
     --set 'config.database.secret.databaseUsername=postgres' \
     --set 'config.database.secret.databasePassword=postgres' \
     --set 'config.database.secret.databaseConnectionUrl="postgres.example.local:5432/postgres?ssl=disable"' \

renovate.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "assignees": [ "volker.raschek" ],
+  "customManagers": [
+    {
+      "description": "Update container image reference",
+      "fileMatch": [
+        "^Chart\\.yaml$"
+      ],
+      "matchStrings": [
+        "appVersion: \"(?<currentValue>.*?)\"\\s+"
+      ],
+      "datasourceTemplate": "docker",
+      "depNameTemplate": "prometheus-postgres-exporter",
+      "lookupNameTemplate": "quay.io/prometheuscommunity/postgres-exporter"
+    }
+  ],
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "addLabels": [ "renovate/prometheus-postgres-exporter", "renovate/automerge" ],
+      "automerge": true,
+      "matchPackageNames": [ "prometheus-postgres-exporter" ],
+      "matchManagers": [ "regex" ],
+      "matchUpdateTypes": [ "minor", "patch"]
+    }
+  ],
+  "rebaseLabel": "renovate/rebase",
+  "rebaseWhen": "behind-base-branch"
+}

templates/prometheus-postgres-exporter/serviceAccount.yaml

@@ -13,14 +13,13 @@ metadata:
   {{- end }}
   name: {{ include "prometheus-postgres-exporter.fullname" . }}
   namespace: {{ .Release.Namespace }}
-spec:
+automountServiceAccountToken: {{ .Values.serviceAccount.new.automountServiceAccountToken }}
-  automountServiceAccountToken: {{ .Values.serviceAccount.new.automountServiceAccountToken }}
+{{- with .Values.serviceAccount.new.imagePullSecrets }}
-  {{- with .Values.serviceAccount.new.imagePullSecrets }}
+imagePullSecrets:
-  imagePullSecrets:
   {{- toYaml . | nindent 4 }}
-  {{- end }}
+{{- end }}
-  {{- with .Values.serviceAccount.new.secrets }}
+{{- with .Values.serviceAccount.new.secrets }}
-  secrets:
+secrets:
-    {{- toYaml . | nindent 4 }}
+  {{- toYaml . | nindent 4 }}
-  {{- end }}
+{{- end }}
 {{- end }}

unittests/serviceAccounts/serviceAccount.yaml

@@ -29,12 +29,12 @@ tests:
   - notExists:
       path: metadata.labels
   - equal:
-      path: spec.automountServiceAccountToken
+      path: automountServiceAccountToken
       value: true
   - notExists:
-      path: spec.imagePullSecrets
+      path: imagePullSecrets
   - notExists:
-      path: spec.secrets
+      path: secrets
 
 
 - it: Rendering serviceAccount with custom values.
@@ -65,14 +65,14 @@ tests:
       path: metadata.name
       value: prometheus-postgres-exporter-unittest
   - equal:
-      path: spec.automountServiceAccountToken
+      path: automountServiceAccountToken
       value: false
   - equal:
-      path: spec.imagePullSecrets
+      path: imagePullSecrets
       value:
         - name: "my-pull-secret"
   - equal:
-      path: spec.secrets
+      path: secrets
       value:
       - name: "my-secret"
         namespace: "my-namespace"