.gitea/workflows/generate-readme.yaml

@@ -15,7 +15,7 @@ on:
 jobs:
   generate-parameters:
     container:
-      image: docker.io/library/node:23.8.0-alpine
+      image: docker.io/library/node:23.6.0-alpine
     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:23.8.0-alpine
+      image: docker.io/library/node:23.6.0-alpine
     runs-on:
     - ubuntu-latest
     steps:
@@ -31,7 +31,7 @@ jobs:
 
   markdown-lint:
     container:
-      image: docker.io/library/node:23.8.0-alpine
+      image: docker.io/library/node:23.6.0-alpine
     runs-on:
     - ubuntu-latest
     steps:

README.md

@@ -20,7 +20,7 @@ helm chart is tested for deployment scenarios with **ArgoCD**.
 ## Helm: configuration and installation
 
 1. A helm chart repository must be configured, to pull the helm charts from.
-2. All available parameters are [here](#parameters) in detail documented. The parameters can be defined via the helm
+2. All available parameters are [here](#parameters) in detail document. The parameters can be defined via the helm
    `--set` flag or directly as part of a `values.yaml` file. The following example defines the `prometheus-exporter`
    repository and use the `--set` flag for a basic deployment.
 
@@ -46,7 +46,7 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi
 versions can break something!
 
 ```bash
-CHART_VERSION=0.3.2
+CHART_VERSION=0.3.1
 helm show values prometheus-exporters/prometheus-postgres-exporter --version "${CHART_VERSION}" > values.yaml
 ```
 
@@ -187,75 +187,6 @@ deployment:
             - postgres
 ```
 
-### Network policies
-
-Network policies can only take effect, when the used CNI plugin support network policies. The chart supports no custom
-network policy implementation of CNI plugins. It's support only the official API resource of `networking.k8s.io/v1`.
-
-The object networkPolicies can contains multiple networkPolicy definitions. There is currently only one example
-predefined - it's named `default`. Further networkPolicy rules can easy be added by defining additional objects. For example:
-
-> [!NOTE]
-> The structure of each custom network policy must be equal like that of default. For this reason don't forget to define
-> `annotations`, `labels` and the other properties as well.
-
-```yaml
-networkPolicies:
-  enabled: false
-  default: {}
-  my-custom-network-policy: {}
-```
-
-The example below is an excerpt of the `values.yaml` file. The network policy `default` contains ingress rules to allow
-incoming traffic from Prometheus. Additionally two egress rules are defined, to allow the application outgoing access to
-the internal running DNS server `core-dns` and the external running postgres database listen on `10.14.243.12`.
-
-> [!IMPORTANT]
-> Please keep in mind, that the namespace and pod selector labels can be different from environment to environment. For
-> this reason, there is are not default network policy rules defined.
-
-```yaml
-networkPolicies:
-  enabled: true
-  default:
-    enabled: true
-    annotations: {}
-    labels: {}
-    policyTypes:
-    - Egress
-    - Ingress
-    egress:
-    - to:
-      - ipBlock:
-          cidr: 10.14.243.12/32
-      ports:
-      - port: 5432
-        protocol: TCP
-    - to:
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: kube-system
-        podSelector:
-          matchLabels:
-           k8s-app: kube-dns
-      ports:
-      - port: 53
-        protocol: TCP
-      - port: 53
-        protocol: UDP
-    ingress:
-    - from:
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: monitoring
-        podSelector:
-          matchLabels:
-            app.kubernetes.io/name: prometheus
-      ports:
-      - port: http
-        protocol: TCP
-```
-
 ## Parameters
 
 ### Global
@@ -317,7 +248,7 @@ networkPolicies:
 | `deployment.replicas`                              | Number of replicas for the postgres-exporter deployment.                                                   | `1`                                     |
 | `deployment.restartPolicy`                         | Restart policy of the postgres-exporter deployment.                                                        | `""`                                    |
 | `deployment.securityContext`                       | Security context of the postgres-exporter deployment.                                                      | `{}`                                    |
-| `deployment.strategy.type`                         | Strategy type - `Recreate` or `RollingUpdate`.                                                             | `RollingUpdate`                         |
+| `deployment.strategy.type`                         | Strategy type - `Recreate` or `Rollingupdate`.                                                             | `Rollingupdate`                         |
 | `deployment.strategy.rollingUpdate.maxSurge`       | The maximum number of pods that can be scheduled above the desired number of pods during a rolling update. | `1`                                     |
 | `deployment.strategy.rollingUpdate.maxUnavailable` | The maximum number of pods that can be unavailable during a rolling update.                                | `1`                                     |
 | `deployment.terminationGracePeriodSeconds`         | How long to wait until forcefully kill the pod.                                                            | `60`                                    |
@@ -352,17 +283,11 @@ networkPolicies:
 | --------------------- | ---------------------- | ----- |
 | `podDisruptionBudget` | Pod disruption budget. | `{}`  |
 
-### NetworkPolicies
+### Network
 
-| Name                                  | Description                                                                                           | Value   |
+| Name              | Description                                                                                                        | Value |
-| ------------------------------------- | ----------------------------------------------------------------------------------------------------- | ------- |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------ | ----- |
-| `networkPolicies.enabled`             | Enable network policies in general.                                                                   | `false` |
+| `networkPolicies` | Deploy network policies based on the used container network interface (CNI) implementation - like calico or weave. | `{}`  |
-| `networkPolicies.default.enabled`     | Enable the network policy for accessing the application by default. For example to scape the metrics. | `false` |
-| `networkPolicies.default.annotations` | Additional network policy annotations.                                                                | `{}`    |
-| `networkPolicies.default.labels`      | Additional network policy labels.                                                                     | `{}`    |
-| `networkPolicies.default.policyTypes` | List of policy types. Supported is ingress, egress or ingress and egress.                             | `[]`    |
-| `networkPolicies.default.egress`      | Concrete egress network policy implementation.                                                        | `[]`    |
-| `networkPolicies.default.ingress`     | Concrete ingress network policy implementation.                                                       | `[]`    |
 
 ### Prometheus
 

package.json

@@ -16,6 +16,6 @@
   "devDependencies": {
     "@bitnami/readme-generator-for-helm": "^2.5.0",
     "markdown-link-check": "^3.13.6",
-    "markdownlint-cli": "^0.44.0"
+    "markdownlint-cli": "^0.43.0"
   }
 }

renovate.json

@@ -1,8 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [
+  "assignees": [ "volker.raschek" ],
-    "volker.raschek"
-  ],
   "customManagers": [
     {
       "fileMatch": [
@@ -27,40 +25,17 @@
       "versioningTemplate": "semver"
     }
   ],
-  "labels": [
+  "labels": [ "renovate" ],
-    "renovate"
-  ],
-  "lockFileMaintenance": {
-    "enabled": true
-  },
-  "npm": {
-    "enabled": true
-  },
   "packageRules": [
     {
-      "addLabels": [
+      "addLabels": [ "renovate/automerge", "renovate/npm" ],
-        "renovate/automerge",
-        "renovate/npm"
-      ],
       "automerge": true,
-      "matchPackageNames": [
+      "matchPackageNames": [ "markdownlint-cli", "@bitnami/readme-generator-for-helm" ],
-        "@bitnami/readme-generator-for-helm",
+      "matchManagers": [ "npm" ],
-        "markdownlint-cli",
+      "matchUpdateTypes": [ "minor", "patch"]
-        "markdown-link-check"
-      ],
-      "matchManagers": [
-        "npm"
-      ],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ]
     },
     {
-      "addLabels": [
+      "addLabels": [ "renovate/automerge", "renovate/container" ],
-        "renovate/automerge",
-        "renovate/container"
-      ],
       "automerge": true,
       "excludePackagePatterns": [
         "prometheuscommunity/postgres-exporter"
@@ -74,10 +49,7 @@
       ]
     },
     {
-      "addLabels": [
+      "addLabels": [ "renovate/automerge", "renovate/documentation" ],
-        "renovate/automerge",
-        "renovate/documentation"
-      ],
       "automerge": true,
       "matchDepNames": [
         "volker.raschek/prometheus-postgres-exporter"

templates/prometheus-postgres-exporter/_networkPolicies.tpl

@@ -1,19 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{/* annotations */}}
-
-{{- define "prometheus-postgres-exporter.networkPolicies.annotations" -}}
-{{ include "prometheus-postgres-exporter.annotations" .context }}
-{{- if .networkPolicy.annotations }}
-{{ toYaml .networkPolicy.annotations }}
-{{- end }}
-{{- end }}
-
-{{/* labels */}}
-
-{{- define "prometheus-postgres-exporter.networkPolicies.labels" -}}
-{{ include "prometheus-postgres-exporter.labels" .context }}
-{{- if .networkPolicy.labels }}
-{{ toYaml .networkPolicy.labels }}
-{{- end }}
-{{- end }}

templates/prometheus-postgres-exporter/networkPolicies.yaml

@@ -1,36 +0,0 @@
-{{- if .Values.networkPolicies.enabled }}
-{{- range $key, $value := .Values.networkPolicies -}}
-{{- if and (not (eq $key "enabled")) $value.enabled }}
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  {{- with (include "prometheus-postgres-exporter.networkPolicies.annotations" (dict "networkPolicy" $value "context" $) | fromYaml) }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with (include "prometheus-postgres-exporter.networkPolicies.labels" (dict "networkPolicy" $value "context" $) | fromYaml) }}
-  labels:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  name: {{ printf "%s-%s" (include "prometheus-postgres-exporter.fullname" $ ) $key }}
-  namespace: {{ $.Release.Namespace }}
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "prometheus-postgres-exporter.pod.selectorLabels" $ | nindent 6 }}
-  {{- with $value.policyTypes }}
-  policyTypes:
-  {{- toYaml . | nindent 2 }}
-  {{- end }}
-  {{- with $value.egress }}
-  egress:
-  {{- toYaml . | nindent 2 }}
-  {{- end }}
-  {{- with $value.ingress }}
-  ingress:
-  {{- toYaml . | nindent 2 }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}

unittests/networkPolicies/default.yaml

@@ -1,118 +0,0 @@
-chart:
-  appVersion: 0.1.0
-  version: 0.1.0
-suite: NetworkPolicies template (basic)
-release:
-  name: prometheus-postgres-exporter-unittest
-  namespace: testing
-templates:
-- templates/prometheus-postgres-exporter/networkPolicies.yaml
-tests:
-- it: Skip networkPolicies in general disabled.
-  set:
-    networkPolicies.enabled: false
-  asserts:
-  - hasDocuments:
-      count: 0
-
-- it: Skip networkPolicy 'default' when disabled.
-  set:
-    networkPolicies.enabled: true
-    networkPolicies.default.enabled: false
-  asserts:
-  - hasDocuments:
-      count: 0
-
-- it: Loop over networkPolicies
-  set:
-    networkPolicies.enabled: true
-    networkPolicies.default.enabled: false
-    networkPolicies.nginx.enabled: true
-    networkPolicies.prometheus.enabled: true
-  asserts:
-  - hasDocuments:
-      count: 2
-
-- it: Template networkPolicy 'default' without policyTypes, egress and ingress configuration
-  set:
-    networkPolicies.enabled: true
-    networkPolicies.default.enabled: true
-  asserts:
-  - hasDocuments:
-      count: 1
-  - containsDocument:
-      apiVersion: networking.k8s.io/v1
-      kind: NetworkPolicy
-      name: prometheus-postgres-exporter-unittest-default
-      namespace: testing
-  - notExists:
-      path: metadata.annotations
-  - equal:
-      path: metadata.labels
-      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.podSelector.matchLabels
-      value:
-        app.kubernetes.io/instance: prometheus-postgres-exporter-unittest
-        app.kubernetes.io/name: prometheus-postgres-exporter
-  - notExists:
-      path: spec.policyTypes
-  - notExists:
-      path: spec.egress
-  - notExists:
-      path: spec.ingress
-
-- it: Template networkPolicy 'default' with policyTypes, egress and ingress configuration
-  set:
-    networkPolicies.enabled: true
-    networkPolicies.default.enabled: true
-    networkPolicies.default.policyTypes:
-    - Egress
-    - Ingress
-    networkPolicies.default.ingress:
-    - from:
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: khv-production
-        podSelector:
-          matchLabels:
-            app.kubernetes.io/name: prometheus
-    networkPolicies.default.egress:
-    - to:
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: database
-        podSelector:
-          matchLabels:
-            app.kubernetes.io/name: oracle
-  asserts:
-  - equal:
-      path: spec.policyTypes
-      value:
-      - Egress
-      - Ingress
-  - equal:
-      path: spec.egress
-      value:
-      - to:
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: database
-          podSelector:
-            matchLabels:
-              app.kubernetes.io/name: oracle
-  - equal:
-      path: spec.ingress
-      value:
-      - from:
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: khv-production
-          podSelector:
-            matchLabels:
-              app.kubernetes.io/name: prometheus

values.yaml

@@ -224,11 +224,11 @@ deployment:
   securityContext: {}
     # fsGroup: 2000
 
-  ## @param deployment.strategy.type Strategy type - `Recreate` or `RollingUpdate`.
+  ## @param deployment.strategy.type Strategy type - `Recreate` or `Rollingupdate`.
   ## @param deployment.strategy.rollingUpdate.maxSurge The maximum number of pods that can be scheduled above the desired number of pods during a rolling update.
   ## @param deployment.strategy.rollingUpdate.maxUnavailable The maximum number of pods that can be unavailable during a rolling update.
   strategy:
-    type: "RollingUpdate"
+    type: "Rollingupdate"
     rollingUpdate:
       maxSurge: 1
       maxUnavailable: 1
@@ -311,77 +311,9 @@ podDisruptionBudget: {}
 #  maxUnavailable: 1
 #  minAvailable: 1
 
-## @section NetworkPolicies
+## @section Network
-## @param networkPolicies.enabled Enable network policies in general.
+## @param networkPolicies Deploy network policies based on the used container network interface (CNI) implementation - like calico or weave.
-networkPolicies:
+networkPolicies: {}
-  enabled: false
-
-  ## @param networkPolicies.default.enabled Enable the network policy for accessing the application by default. For example to scape the metrics.
-  ## @param networkPolicies.default.annotations Additional network policy annotations.
-  ## @param networkPolicies.default.labels Additional network policy labels.
-  ## @param networkPolicies.default.policyTypes List of policy types. Supported is ingress, egress or ingress and egress.
-  ## @param networkPolicies.default.egress Concrete egress network policy implementation.
-  ## @skip networkPolicies.default.egress Skip individual egress configuration.
-  ## @param networkPolicies.default.ingress Concrete ingress network policy implementation.
-  ## @skip networkPolicies.default.ingress Skip individual ingress configuration.
-  default:
-    enabled: false
-    annotations: {}
-    labels: {}
-    policyTypes: []
-    # - Egress
-    # - Ingress
-    egress: []
-    # Allow outgoing traffic to database host
-    #
-    # - to:
-    #   - ipBlock:
-    #       cidr: 192.168.179.1/32
-    #   ports:
-    #   - port: 5432
-    #     protocol: TCP
-
-    # Allow outgoing DNS traffic to the internal running DNS-Server. For example core-dns.
-    #
-    # - to:
-    #   - namespaceSelector:
-    #       matchLabels:
-    #         kubernetes.io/metadata.name: kube-system
-    #     podSelector:
-    #       matchLabels:
-    #        k8s-app: kube-dns
-    #   ports:
-    #   - port: 53
-    #     protocol: TCP
-    #   - port: 53
-    #     protocol: UDP
-
-    ingress: []
-    # Allow incoming HTTP traffic from prometheus.
-    #
-    # - from:
-    #   - namespaceSelector:
-    #       matchLabels:
-    #         kubernetes.io/metadata.name: monitoring
-    #     podSelector:
-    #       matchLabels:
-    #         app.kubernetes.io/name: prometheus
-    #   ports:
-    #   - port: http
-    #     protocol: TCP
-
-    # Allow incoming HTTP traffic from ingress-nginx.
-    #
-    # - from:
-    #   - namespaceSelector:
-    #       matchLabels:
-    #         kubernetes.io/metadata.name: ingress-nginx
-    #     podSelector:
-    #       matchLabels:
-    #         app.kubernetes.io/name: ingress-nginx
-    #   ports:
-    #   - port: http
-    #     protocol: TCP
 
 ## @section Prometheus
 prometheus: