fix(secret): adapt of the web config secret

Reviewed-on: #5

Chart.yaml

@@ -4,7 +4,7 @@ description: Prometheus metric exporter for PostgreSQL
 type: application
 kubeVersion: ">=1.20.0"
 version: "0.1.0"
-appVersion: "0.15.0"
+appVersion: "0.16.0"
 
 # icon: https://annotations.example.com/icon.png
 

README.md

@@ -12,7 +12,7 @@ and use it to deploy the exporter. It also contains further configuration exampl
 Furthermore, this helm chart unit tests to detect regressions and stabilize the deployment. Additionally, this helm
 chart is tested for deployment scenarios with ArgoCD.
 
-> ![NOTE]
+> [!NOTE]
 > This is not the official *community* helm chart of the Prometheus metric exporter for PostgreSQL databases. You can
 > find the official community chart [here](https://github.com/prometheus-community/helm-charts).
 

renovate.json

@@ -24,10 +24,10 @@
       "matchUpdateTypes": [ "minor", "patch"]
     },
     {
-      "addLabels": [ "renovate/prometheus-postgres-exporter", "renovate/automerge" ],
+      "addLabels": [ "renovate/markdownlint", "renovate/automerge" ],
       "automerge": true,
-      "matchPackageNames": [ "prometheus-postgres-exporter" ],
-      "matchManagers": [ "regex" ],
+      "matchPackageNames": [ "markdownlint-cli", "@bitnami/readme-generator-for-helm" ],
+      "matchManagers": [ "npm" ],
       "matchUpdateTypes": [ "minor", "patch"]
     }
   ],

templates/prometheus-postgres-exporter/_deployment.tpl

@@ -53,7 +53,7 @@
 
 {{- define "prometheus-postgres-exporter.deployment.volumeMounts" -}}
 {{- $volumeMounts := dict "volumeMounts" (.Values.deployment.postgresExporter.volumeMounts | default (list) ) }}
-{{- $volumeMounts = merge $volumeMounts (dict "volumeMounts" (list (dict "name" "config.d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" ))) }}
+{{- $volumeMounts = merge $volumeMounts (dict "volumeMounts" (list (dict "name" "config-d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" ))) }}
 {{ toYaml $volumeMounts }}
 {{- end -}}
 
@@ -72,7 +72,7 @@
 {{- $webConfigSecretName = printf "%s-web-config" (include "prometheus-postgres-exporter.fullname" . ) }}
 {{- end }}
 
-{{- $volumes = merge $volumes (dict "volumes" (list (dict "name" "config.d" "projected" (dict "defaultMode" "0444" "sources" (list (dict "secret" (dict "name" $exporterSecretName)) (dict "secret" (dict "name" $webConfigSecretName))))))) }}
+{{- $volumes = merge $volumes (dict "volumes" (list (dict "name" "config-d" "projected" (dict "defaultMode" 444 "sources" (list (dict "secret" (dict "name" $exporterSecretName)) (dict "secret" (dict "name" $webConfigSecretName))))))) }}
 
 {{ toYaml $volumes }}
 

templates/prometheus-postgres-exporter/_pod.tpl

@@ -13,5 +13,5 @@
 {{- end }}
 
 {{- define "prometheus-postgres-exporter.pod.selectorLabels" -}}
-{{ include "prometheus-postgres-exporter.pod.labels" . }}
+{{ include "prometheus-postgres-exporter.selectorLabels" . }}
 {{- end }}

templates/prometheus-postgres-exporter/deployment.yaml

@@ -24,7 +24,7 @@ spec:
       - name: postgres-exporter
         args:
         - "--config.file=/etc/prometheus-postgres-exporter/config.d/exporterConfig.yaml"
-        - "--web.config.file=/etc/prometheus-postgres-exporter/config.d/web-config.yaml"
+        - "--web.config.file=/etc/prometheus-postgres-exporter/config.d/webConfig.yaml"
         - "--web.listen-address=:9187"
         {{- range .Values.deployment.postgresExporter.args }}
         - {{ . | quote }}

templates/prometheus-postgres-exporter/secretWebConfig.yaml

@@ -11,7 +11,7 @@ metadata:
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ include "prometheus-postgres-exporter.fullname" . }}-webconfig
+  name: {{ include "prometheus-postgres-exporter.fullname" . }}-web-config
   namespace: {{ .Release.Namespace }}
 stringData:
   webConfig.yaml: |

templates/prometheus-postgres-exporter/serviceMonitorHTTP.yaml

@@ -26,7 +26,7 @@ spec:
     {{- end }}
     scrapeTimeout: {{ required "The scrape timeout of the serviceMonitor is not defined!" .Values.prometheus.metrics.serviceMonitor.scrapeTimeout }}
     scheme: {{ required "The scheme of the serviceMonitor is not defined!" .Values.prometheus.metrics.serviceMonitor.scheme}}
-    targetPort: {{ required "The port of the serviceMonitor is not defined!" .Values.prometheus.metrics.serviceMonitor.port }}
+    targetPort: {{ required "The port of the service is not defined!" .Values.services.http.port }}
     {{- with .Values.prometheus.metrics.serviceMonitor.tlsConfig }}
     tlsConfig:
       {{- toYaml . | nindent 6 }}

unittests/deployment/deployment.yaml

@@ -36,19 +36,19 @@ tests:
       path: spec.template.spec.containers[0].args
       value:
       - --config.file=/etc/prometheus-postgres-exporter/config.d/exporterConfig.yaml
-      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/web-config.yaml
+      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/webConfig.yaml
       - --web.listen-address=:9187
   - equal:
       path: spec.template.spec.containers[0].volumeMounts
       value:
       - mountPath: /etc/prometheus-postgres-exporter/config.d
-        name: config.d
+        name: config-d
   - equal:
       path: spec.template.spec.volumes
       value:
-      - name: config.d
+      - name: config-d
         projected:
-          defaultMode: "0444"
+          defaultMode: 444
           sources:
           - secret:
               name: prometheus-postgres-exporter-unittest-exporter-config
@@ -101,7 +101,7 @@ tests:
       path: spec.template.spec.containers[0].args
       value:
       - --config.file=/etc/prometheus-postgres-exporter/config.d/exporterConfig.yaml
-      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/web-config.yaml
+      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/webConfig.yaml
       - --web.listen-address=:9187
       - --foo=bar
       - --bar=foo
@@ -143,13 +143,13 @@ tests:
       path: spec.template.spec.containers[0].volumeMounts
       value:
       - mountPath: /etc/prometheus-postgres-exporter/config.d
-        name: config.d
+        name: config-d
   - equal:
       path: spec.template.spec.volumes
       value:
-      - name: config.d
+      - name: config-d
         projected:
-          defaultMode: "0444"
+          defaultMode: 444
           sources:
           - secret:
               name: exporter-config-secret
@@ -165,13 +165,13 @@ tests:
       path: spec.template.spec.containers[0].volumeMounts
       value:
       - mountPath: /etc/prometheus-postgres-exporter/config.d
-        name: config.d
+        name: config-d
   - equal:
       path: spec.template.spec.volumes
       value:
-      - name: config.d
+      - name: config-d
         projected:
-          defaultMode: "0444"
+          defaultMode: 444
           sources:
           - secret:
               name: prometheus-postgres-exporter-unittest-exporter-config

unittests/podMonitors/podMonitorHTTP.yaml

@@ -90,10 +90,7 @@ tests:
       path: spec.selector.matchLabels
       value:
         app.kubernetes.io/instance: prometheus-postgres-exporter-unittest
-        app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: prometheus-postgres-exporter
-        app.kubernetes.io/version: 0.1.0
-        helm.sh/chart: prometheus-postgres-exporter-0.1.0
 
 - it: Render podMonitor with custom annotations and labels.
   set:

unittests/secrets/webconfig.yaml

@@ -15,7 +15,7 @@ tests:
   - containsDocument:
       apiVersion: v1
       kind: Secret
-      name: prometheus-postgres-exporter-unittest-webconfig
+      name: prometheus-postgres-exporter-unittest-web-config
       namespace: testing
   - notExists:
       path: metadata.annotations

unittests/serviceMonitors/serviceMonitorHTTP.yaml

@@ -134,7 +134,6 @@ tests:
       action: "drop"
     prometheus.metrics.serviceMonitor.scrapeTimeout: "5s"
     prometheus.metrics.serviceMonitor.scheme: "http"
-    prometheus.metrics.serviceMonitor.port: 10443
   asserts:
   - hasDocuments:
       count: 1
@@ -166,7 +165,4 @@ tests:
       value: 5s
   - equal:
       path: spec.endpoints[0].scheme
-      value: http
-  - equal:
-      path: spec.endpoints[0].targetPort
-      value: 10443
+      value: http

unittests/services/http.yaml

@@ -63,10 +63,7 @@ tests:
       path: spec.selector
       value:
         app.kubernetes.io/instance: prometheus-postgres-exporter-unittest
-        app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: prometheus-postgres-exporter
-        app.kubernetes.io/version: 0.1.0
-        helm.sh/chart: prometheus-postgres-exporter-0.1.0
   - equal:
       path: spec.sessionAffinity
       value: None

values.yaml

@@ -332,7 +332,6 @@ prometheus:
     ## @param prometheus.metrics.serviceMonitor.honorLabels Honor labels.
     ## @param prometheus.metrics.serviceMonitor.interval Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.
     ## @param prometheus.metrics.serviceMonitor.path HTTP path for scraping prometheus metrics.
-    ## @param prometheus.metrics.serviceMonitor.port HTTP port for scraping prometheus metrics.
     ## @param prometheus.metrics.serviceMonitor.relabelings RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields.
     ## @param prometheus.metrics.serviceMonitor.scrapeTimeout Timeout after which the scrape is ended. If not specified, global Prometheus scrape timeout is used.
     ## @param prometheus.metrics.serviceMonitor.scheme HTTP scheme to use for scraping. For example `http` or `https`.
@@ -347,7 +346,6 @@ prometheus:
       honorLabels: false
       interval: "60s"
       path: "/metrics"
-      port: 9187
       relabelings: []
       scrapeTimeout: "30s"
       scheme: "http"