change default resources

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-added-large-files
+      - id: check-yaml
+        exclude: 'charts/'
+        args:
+          - --multi
+  - repo: https://github.com/norwoodj/helm-docs
+    rev: v1.14.2
+    hooks:
+      - id: helm-docs
+        args:
+          - --chart-search-root=charts
+          - --template-files=./_templates.gotmpl
+          - --template-files=README.md.gotmpl

charts/cloudflared/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 1.12.0
+version: 1.12.3
 description: Cloudflared Tunnel
 keywords:
   - cloudflare
@@ -13,6 +13,6 @@ maintainers:
 dependencies:
   - name: common
     repository: https://bjw-s.github.io/helm-charts/
-    version: 3.5.1
+    version: 3.6.0
 icon: https://avatars.githubusercontent.com/u/314135?s=48&v=4
 appVersion: "2024.12.2"

charts/cloudflared/README.md

@@ -1,16 +1,35 @@
-## Introduction
+# cloudflared
 
-[Cloudflared](https://github.com/cloudflare/cloudflared)
+![Version: 1.12.3](https://img.shields.io/badge/Version-1.12.3-informational?style=flat-square) ![AppVersion: 2024.12.2](https://img.shields.io/badge/AppVersion-2024.12.2-informational?style=flat-square)
 
-Contains the command-line client for Cloudflare Tunnel, a tunneling daemon that proxies traffic from the Cloudflare network to your origins.
+Cloudflared Tunnel
 
-This chart bootstraps a [Cloudflared](https://github.com/cloudflare/cloudflared) tunnel on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+## Maintainers
 
-## Prerequisites
+| Name | Email | Url |
+| ---- | ------ | --- |
+| alexlebens |  |  |
 
-- Kubernetes
+## Source Code
-- Helm
 
-## Parameters
+* <https://github.com/cloudflare/cloudflared>
+* <https://github.com/bjw-s/helm-charts/tree/main/charts/library/common>
 
-See the [values files](values.yaml).
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://bjw-s.github.io/helm-charts/ | common | 3.6.0 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| existingSecretKey | string | `"cf-tunnel-token"` | Name of key that contains the token in the existingSecret |
+| existingSecretName | string | `"cloudflared-secret"` | Name of existing secret that contains Cloudflare token |
+| image | object | `{"pullPolicy":"IfNotPresent","repository":"cloudflare/cloudflared","tag":"2024.12.2"}` | Default image |
+| name | string | `"cloudflared"` | Name override of release |
+| resources | object | `{"requests":{"cpu":"100m","memory":"128Mi"}}` | Default resources |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/cloudflared/values.yaml

@@ -1,10 +1,19 @@
+# -- Name override of release
 name: cloudflared
+
+# -- Name of existing secret that contains Cloudflare token
 existingSecretName: cloudflared-secret
+
+# -- Name of key that contains the token in the existingSecret
 existingSecretKey: cf-tunnel-token
+
+# -- Default image
 image:
   repository: cloudflare/cloudflared
   tag: "2024.12.2"
   pullPolicy: IfNotPresent
+
+# -- Default resources
 resources:
   requests:
     cpu: 100m

charts/generic-device-plugin/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: generic-device-plugin
-version: 0.1.2
+version: 0.1.5
 description: Generic Device Plugin
 keywords:
   - generic-device-plugin
@@ -14,5 +14,5 @@ maintainers:
 dependencies:
   - name: common
     repository: https://bjw-s.github.io/helm-charts/
-    version: 3.5.1
+    version: 3.6.0
-appVersion: 0.1.2
+appVersion: 0.1.5

charts/generic-device-plugin/README.md

@@ -1,16 +1,37 @@
-## Introduction
+# generic-device-plugin
 
-[Generic Device Plugin](https://github.com/squat/generic-device-plugin)
+![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![AppVersion: 0.1.5](https://img.shields.io/badge/AppVersion-0.1.5-informational?style=flat-square)
 
-The generic-device-plugin enables allocating generic Linux devices, such as serial devices, the FUSE device, or video cameras, to Kubernetes Pods.
+Generic Device Plugin
 
-This chart bootstraps a [Generic Device Plugin](https://github.com/squat/generic-device-plugin) daemonset on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+## Maintainers
 
-## Prerequisites
+| Name | Email | Url |
+| ---- | ------ | --- |
+| alexlebens |  |  |
 
-- Kubernetes
+## Source Code
-- Helm
 
-## Parameters
+* <https://github.com/squat/generic-device-plugin>
+* <https://github.com/bjw-s/helm-charts/tree/main/charts/library/common>
 
-See the [values files](values.yaml).
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://bjw-s.github.io/helm-charts/ | common | 3.6.0 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| config | object | `{"data":"devices:\n  - name: serial\n    groups:\n      - paths:\n          - path: /dev/ttyUSB*\n      - paths:\n          - path: /dev/ttyACM*\n      - paths:\n          - path: /dev/tty.usb*\n      - paths:\n          - path: /dev/cu.*\n      - paths:\n          - path: /dev/cuaU*\n      - paths:\n          - path: /dev/rfcomm*\n  - name: video\n    groups:\n      - paths:\n          - path: /dev/video0\n  - name: fuse\n    groups:\n      - count: 10\n        paths:\n          - path: /dev/fuse\n  - name: audio\n    groups:\n      - count: 10\n        paths:\n          - path: /dev/snd\n  - name: capture\n    groups:\n      - paths:\n          - path: /dev/snd/controlC0\n          - path: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC1\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC1D0c\n            mountPath: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC2\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC2D0c\n            mountPath: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC3\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC3D0c\n            mountPath: /dev/snd/pcmC0D0c\n","enabled":true}` | Config map |
+| config.data | string | See [values.yaml](./values.yaml) | generic-device-plugin config file [[ref]](https://github.com/squat/generic-device-plugin#usage) |
+| deviceDomain | string | `"squat.ai"` | Domain used by devices for identifcation |
+| image | object | `{"pullPolicy":"Always","repository":"ghcr.io/squat/generic-device-plugin","tag":"latest"}` | Default image |
+| name | string | `"generic-device-plugin"` | Name override of release |
+| resources | object | `{"limit":{"cpu":"100m","memory":"20Mi"},"requests":{"cpu":"50m","memory":"10Mi"}}` | Default resources |
+| service | object | `{"listenPort":8080}` | Service port |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/generic-device-plugin/templates/common.yaml

@@ -1,6 +1,6 @@
-{{- include "bjw-s.common.loader.init" . }}
+{{ include "bjw-s.common.loader.init" . }}
 
-{{- define "genericDevicePlugin.hardcodedValues" -}}
+{{ define "genericDevicePlugin.hardcodedValues" }}
 {{ if not .Values.global.nameOverride }}
 global:
   nameOverride: {{ .Values.name }}
@@ -75,8 +75,8 @@ serviceMonitor:
         path: /metrics
         interval: 30s
         scrapeTimeout: 10s
-{{- end -}}
+{{ end }}
-{{- $_ := mergeOverwrite .Values (include "genericDevicePlugin.hardcodedValues" . | fromYaml) -}}
+{{ $_ := mergeOverwrite .Values (include "genericDevicePlugin.hardcodedValues" . | fromYaml) }}
 
 {{/* Render the templates */}}
 {{ include "bjw-s.common.loader.generate" . }}

charts/generic-device-plugin/values.yaml

@@ -1,15 +1,20 @@
+# -- Name override of release
 name: generic-device-plugin
 
+# -- Default image
 image:
   repository: ghcr.io/squat/generic-device-plugin
   pullPolicy: Always
   tag: latest
 
+# -- Domain used by devices for identifcation
 deviceDomain: squat.ai
 
+# -- Service port
 service:
   listenPort: 8080
 
+# -- Default resources
 resources:
   limit:
     cpu: 100m
@@ -18,6 +23,7 @@ resources:
     cpu: 50m
     memory: 10Mi
 
+# -- Config map
 config:
   enabled: true
   # -- generic-device-plugin config file [[ref]](https://github.com/squat/generic-device-plugin#usage)

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 3.20.5
+version: 4.0.3
 description: Chart for cloudnative-pg cluster
 keywords:
   - database
@@ -10,4 +10,4 @@ sources:
 maintainers:
   - name: alexlebens
 icon: https://avatars.githubusercontent.com/u/100373852?s=48&v=4
-appVersion: v1.24.1
+appVersion: v1.25.0

charts/postgres-cluster/README.md

@@ -1,17 +1,82 @@
-## Introduction
+# postgres-cluster
 
-[CloudNative PG](https://github.com/cloudnative-pg/cloudnative-pg)
+![Version: 4.0.3](https://img.shields.io/badge/Version-4.0.3-informational?style=flat-square) ![AppVersion: v1.25.0](https://img.shields.io/badge/AppVersion-v1.25.0-informational?style=flat-square)
 
-CloudNativePG is the Kubernetes operator that covers the full lifecycle of a highly available PostgreSQL database cluster with a primary/standby architecture, using native streaming replication.
+Chart for cloudnative-pg cluster
 
-This chart bootstraps a [CNPG](https://github.com/cloudnative-pg/cloudnative-pg) cluster on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+## Maintainers
 
-## Prerequisites
+| Name | Email | Url |
+| ---- | ------ | --- |
+| alexlebens |  |  |
 
-- Kubernetes
+## Source Code
-- Helm
-- CloudNative PG Operator
 
-## Parameters
+* <https://github.com/cloudnative-pg/cloudnative-pg>
 
-See the [values files](values.yaml).
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| backup.backupIndex | int | `1` | Generate external cluster name, creates: postgresql-{{ .Release.Name }}-cluster-backup-index-{{ .Values.backups.backupIndex }}" |
+| backup.backupName | string | `""` | Name of the backup cluster in the object store, defaults to "cluster.name" |
+| backup.data.compression | string | `"snappy"` | Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
+| backup.data.encryption | string | `""` | Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
+| backup.data.jobs | int | `2` | Number of data files to be archived or restored in parallel. |
+| backup.destinationPath | string | `""` | S3 path starting with "s3://" |
+| backup.enabled | bool | `false` |  |
+| backup.endpointCA | string | `""` | Specifies secret that contains a CA bundle to validate a privately signed certificate, should contain the key ca-bundle.crt |
+| backup.endpointCredentials | string | `""` | Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY |
+| backup.endpointURL | string | `""` | S3 endpoint starting with "https://" |
+| backup.historyTags.backupRetentionPolicy | string | `""` |  |
+| backup.retentionPolicy | string | `"14d"` | Retention policy for backups |
+| backup.schedule | string | `"0 0 0 * * *"` | Scheduled backup in cron format |
+| backup.tags | object | `{"backupRetentionPolicy":""}` | Tags to add to backups. Add in key value beneath the type. |
+| backup.wal.compression | string | `"snappy"` | WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
+| backup.wal.encryption | string | `""` | Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
+| backup.wal.maxParallel | int | `2` | Number of WAL files to be archived or restored in parallel. |
+| bootstrap | object | `{"initdb":{}}` | Bootstrap is the configuration of the bootstrap process when initdb is used. See: https://cloudnative-pg.io/documentation/current/bootstrap/ See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-bootstrapinitdb |
+| bootstrap.initdb | object | `{}` | Example values database: app owner: app secret: "" # Name of the secret containing the initial credentials for the owner of the user database. If empty a new secret will be created from scratch postInitApplicationSQL:   - CREATE TABLE IF NOT EXISTS example; |
+| cluster.additionalLabels | object | `{}` |  |
+| cluster.affinity | object | `{"enablePodAntiAffinity":true,"topologyKey":"kubernetes.io/hostname"}` | See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-AffinityConfiguration |
+| cluster.annotations | object | `{}` |  |
+| cluster.enableSuperuserAccess | bool | `false` | Create secret containing credentials of superuser |
+| cluster.image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/cloudnative-pg/postgresql","tag":"17.2-22"}` | Default image |
+| cluster.instances | int | `3` |  |
+| cluster.logLevel | string | `"info"` |  |
+| cluster.monitoring | object | `{"enabled":false,"podMonitor":{"enabled":true},"prometheusRule":{"enabled":false,"excludeRules":[]}}` | Enable default monitoring and alert rules |
+| cluster.postgresGID | int | `26` |  |
+| cluster.postgresUID | int | `26` | The UID and GID of the postgres user inside the image |
+| cluster.postgresql | object | `{"parameters":{"hot_standby_feedback":"on","max_slot_wal_keep_size":"2000MB","shared_buffers":"128MB"},"shared_preload_libraries":[]}` | Parameters to be set for the database itself See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-PostgresConfiguration |
+| cluster.primaryUpdateMethod | string | `"switchover"` | Method to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated. It can be switchover (default) or in-place (restart). |
+| cluster.primaryUpdateStrategy | string | `"unsupervised"` | Strategy to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated: it can be automated (unsupervised - default) or manual (supervised) |
+| cluster.priorityClassName | string | `""` |  |
+| cluster.resources | object | `{"limits":{"cpu":"1000m","hugepages-2Mi":"256Mi","memory":"2Gi"},"requests":{"cpu":"100m","memory":"256Mi"}}` | Default resources |
+| cluster.storage.size | string | `"10Gi"` |  |
+| cluster.storage.storageClass | string | `""` |  |
+| cluster.walStorage | object | `{"size":"2Gi","storageClass":""}` | Default storage size |
+| mode | string | `"standalone"` | Cluster mode of operation. Available modes: * `standalone` - Default mode. Creates new or updates an existing CNPG cluster. * `recovery` - Same as standalone but creates a cluster from a backup, object store or via pg_basebackup * `replica` - Create database as a replica from another CNPG cluster |
+| nameOverride | string | `""` | Override the name of the cluster |
+| recovery | object | `{"data":{"compression":"snappy","encryption":"","jobs":2},"destinationPath":"","endpointCA":"","endpointCredentials":"","endpointURL":"","pitrTarget":{"time":""},"recoveryIndex":1,"recoveryInstanceName":"","recoveryServerName":"","wal":{"compression":"snappy","encryption":"","maxParallel":2}}` | Recovery settings when booting cluster from external cluster |
+| recovery.data.compression | string | `"snappy"` | Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
+| recovery.data.encryption | string | `""` | Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
+| recovery.data.jobs | int | `2` | Number of data files to be archived or restored in parallel. |
+| recovery.endpointCA | string | `""` | Specifies secret that contains a CA bundle to validate a privately signed certificate, should contain the key ca-bundle.crt |
+| recovery.endpointCredentials | string | `""` | Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY |
+| recovery.endpointURL | string | `""` | S3 https endpoint and the s3:// path |
+| recovery.pitrTarget | object | `{"time":""}` | Point in time recovery target in RFC3339 format |
+| recovery.recoveryIndex | int | `1` | Generate external cluster name, uses: {{ .Release.Name }}postgresql-<major version>-cluster-backup-index-{{ .Values.recovery.recoveryIndex }} |
+| recovery.recoveryInstanceName | string | `""` | Name of the recovery cluster in the object store, defaults to ".Release.Name" |
+| recovery.recoveryServerName | string | `""` | Name of the recovery cluster in the object store, defaults to "cluster.name" |
+| recovery.wal.compression | string | `"snappy"` | WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
+| recovery.wal.encryption | string | `""` | Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
+| recovery.wal.maxParallel | int | `2` | Number of WAL files to be archived or restored in parallel. |
+| replica.externalCluster | object | `{"connectionParameters":{"dbname":"app","host":"postgresql","user":"app"},"password":{"key":"password","name":"postgresql"}}` | External cluster connection, password specifies a secret name and the key containing the password value |
+| replica.importDatabases | list | `["app"]` | If type microservice only one database is allowed, default is app as standard in cnpg clusters |
+| replica.importRoles | list | `[]` | If type microservice no roles are imported and ignored |
+| replica.importType | string | `"microservice"` | See [here](https://cloudnative-pg.io/documentation/current/database_import/) for different import types * `microservice` - Single database import as expected from cnpg clusters * `monolith` - Import multiple databases and roles |
+| replica.postImportApplicationSQL | list | `[]` | If import type is monolith postImportApplicationSQL is not supported and ignored |
+| type | string | `"postgresql"` | Type of the CNPG database. Available types: * `postgresql` * `postgis` * `timescaledb` * `tensorchord` |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/postgres-cluster/templates/_bootstrap.tpl

@@ -2,7 +2,7 @@
 bootstrap:
 {{- if eq .Values.mode "standalone" }}
   initdb:
-    {{- with .Values.cluster.initdb }}
+    {{- with .Values.bootstrap.initdb }}
     {{- with (omit . "postInitApplicationSQL") }}
     {{- . | toYaml | nindent 4 }}
     {{- end }}
@@ -10,7 +10,7 @@ bootstrap:
     {{- if eq .Values.type "tensorchord" }}
     dataChecksums: true
     {{- end }}
-    {{- if or (eq .Values.type "postgis") (eq .Values.type "timescaledb") (eq .Values.type "tensorchord") (.Values.cluster.initdb.postInitApplicationSQL) }}
+    {{- if or (eq .Values.type "postgis") (eq .Values.type "timescaledb") (eq .Values.type "tensorchord") (.Values.bootstrap.initdb.postInitApplicationSQL) }}
     postInitApplicationSQL:
       {{- if eq .Values.type "postgis" }}
       - CREATE EXTENSION IF NOT EXISTS postgis;
@@ -29,7 +29,7 @@ bootstrap:
       - GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA vectors TO "app";
       - GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "app";
       {{- end }}
-      {{- with .Values.cluster.initdb }}
+      {{- with .Values.bootstrap.initdb }}
       {{- range .postInitApplicationSQL }}
       {{- printf "- %s" . | nindent 6 }}
       {{- end }}
@@ -37,7 +37,6 @@ bootstrap:
     {{- end }}
 {{- else if eq .Values.mode "replica" }}
   initdb:
-    database: jellyplist
     import:
       type: {{ .Values.replica.importType }}
       databases:
@@ -62,6 +61,11 @@ bootstrap:
       {{- end }}
       source:
         externalCluster: "{{ include "cluster.name" . }}-cluster"
+    {{- with .Values.bootstrap.initdb }}
+    {{- with (omit . "postInitApplicationSQL") }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
+    {{- end }}
 externalClusters:
   - name: "{{ include "cluster.name" . }}-cluster"
     {{- with .Values.replica.externalCluster }}

charts/postgres-cluster/templates/cluster.yaml

@@ -18,6 +18,7 @@ spec:
   imagePullPolicy: {{ .Values.cluster.image.pullPolicy }}
   postgresUID: {{ .Values.cluster.postgresUID }}
   postgresGID: {{ .Values.cluster.postgresGID }}
+  enableSuperuserAccess: {{ .Values.cluster.enableSuperuserAccess }}
   walStorage:
     size: {{ .Values.cluster.walStorage.size }}
     storageClass: {{ .Values.cluster.walStorage.storageClass }}
@@ -60,4 +61,5 @@ spec:
     enablePodMonitor: {{ and .Values.cluster.monitoring.enabled .Values.cluster.monitoring.podMonitor.enabled }}
 
   {{ include "cluster.bootstrap" . | nindent 2 }}
+
   {{ include "cluster.backup" . | nindent 2 }}

charts/postgres-cluster/values.yaml

@@ -1,7 +1,6 @@
 # -- Override the name of the cluster
 nameOverride: ""
 
-###
 # -- Type of the CNPG database. Available types:
 # * `postgresql`
 # * `postgis`
@@ -9,8 +8,7 @@ nameOverride: ""
 # * `tensorchord`
 type: postgresql
 
-###
+# -- Cluster mode of operation. Available modes:
-# Cluster mode of operation. Available modes:
 # * `standalone` - Default mode. Creates new or updates an existing CNPG cluster.
 # * `recovery` - Same as standalone but creates a cluster from a backup, object store or via pg_basebackup
 # * `replica` - Create database as a replica from another CNPG cluster
@@ -19,15 +17,20 @@ mode: standalone
 cluster:
   instances: 3
 
+  # -- Default image
   image:
     repository: ghcr.io/cloudnative-pg/postgresql
-    tag: "16.6-22"
+    tag: "17.2-22"
     pullPolicy: IfNotPresent
 
-  # The UID and GID of the postgres user inside the image
+  # -- The UID and GID of the postgres user inside the image
   postgresUID: 26
   postgresGID: 26
 
+  # -- Create secret containing credentials of superuser
+  enableSuperuserAccess: false
+
+  # -- Default storage size
   walStorage:
     size: 2Gi
     storageClass: ""
@@ -35,35 +38,36 @@ cluster:
     size: 10Gi
     storageClass: ""
 
+  # -- Default resources
   resources:
     requests:
       memory: 256Mi
-      cpu: 10m
+      cpu: 100m
     limits:
-      memory: 1Gi
+      memory: 2Gi
-      cpu: 800m
+      cpu: 1000m
       hugepages-2Mi: 256Mi
 
-  # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-AffinityConfiguration
+  # -- See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-AffinityConfiguration
   affinity:
     enablePodAntiAffinity: true
     topologyKey: kubernetes.io/hostname
 
   additionalLabels: {}
   annotations: {}
-
   priorityClassName: ""
 
-  # Method to follow to upgrade the primary server during a rolling update procedure, after all replicas have been
+  # -- Method to follow to upgrade the primary server during a rolling update procedure, after all replicas have been
   # successfully updated. It can be switchover (default) or in-place (restart).
   primaryUpdateMethod: switchover
 
-  # Strategy to follow to upgrade the primary server during a rolling update procedure, after all replicas have been
+  # -- Strategy to follow to upgrade the primary server during a rolling update procedure, after all replicas have been
   # successfully updated: it can be automated (unsupervised - default) or manual (supervised)
   primaryUpdateStrategy: unsupervised
 
   logLevel: "info"
 
+  # -- Enable default monitoring and alert rules
   monitoring:
     enabled: false
     podMonitor:
@@ -72,6 +76,7 @@ cluster:
       enabled: false
       excludeRules: []
 
+  # -- Parameters to be set for the database itself
   # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-PostgresConfiguration
   postgresql:
     parameters:
@@ -80,75 +85,76 @@ cluster:
       hot_standby_feedback: "on"
     shared_preload_libraries: []
 
-  # BootstrapInitDB is the configuration of the bootstrap process when initdb is used.
+# -- Bootstrap is the configuration of the bootstrap process when initdb is used.
 # See: https://cloudnative-pg.io/documentation/current/bootstrap/
 # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-bootstrapinitdb
-  initdb: {}
+bootstrap:
+  # -- Example values
   # database: app
   # owner: app
   # secret: "" # Name of the secret containing the initial credentials for the owner of the user database. If empty a new secret will be created from scratch
   # postInitApplicationSQL:
   #   - CREATE TABLE IF NOT EXISTS example;
+  initdb: {}
 
+# -- Recovery settings when booting cluster from external cluster
 recovery:
-  # Point in time recovery target in RFC3339 format
+
+  # -- Point in time recovery target in RFC3339 format
   pitrTarget:
     time: ""
 
-  # S3 https endpoint and the s3:// path
+  # -- S3 https endpoint and the s3:// path
   endpointURL: ""
   destinationPath: ""
 
-  # Specifies secret that contains a CA bundle to validate a privately signed certificate, should contain the key ca-bundle.crt
+  # -- Specifies secret that contains a CA bundle to validate a privately signed certificate, should contain the key ca-bundle.crt
   endpointCA: ""
 
-  # Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY
+  # -- Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY
   endpointCredentials: ""
 
-  # Generate external cluster name, uses: {{ .Release.Name }}postgresql-<major version>-cluster-backup-index-{{ .Values.recovery.recoveryIndex }}
+  # -- Generate external cluster name, uses: {{ .Release.Name }}postgresql-<major version>-cluster-backup-index-{{ .Values.recovery.recoveryIndex }}
   recoveryIndex: 1
 
-  # Name of the recovery cluster in the object store, defaults to "cluster.name"
+  # -- Name of the recovery cluster in the object store, defaults to "cluster.name"
   recoveryServerName: ""
 
-  # Name of the recovery cluster in the object store, defaults to ".Release.Name"
+  # -- Name of the recovery cluster in the object store, defaults to ".Release.Name"
   recoveryInstanceName: ""
 
   wal:
-    # WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
+    # -- WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
     compression: snappy
-    # Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`.
+    # -- Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`.
     encryption: ""
-    # Number of WAL files to be archived or restored in parallel.
+    # -- Number of WAL files to be archived or restored in parallel.
     maxParallel: 2
   data:
-    # Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
+    # -- Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
     compression: snappy
-    # Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
+    # -- Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
     encryption: ""
-    # Number of data files to be archived or restored in parallel.
+    # -- Number of data files to be archived or restored in parallel.
     jobs: 2
 
 replica:
-  # See https://cloudnative-pg.io/documentation/current/database_import/
+  # -- See [here](https://cloudnative-pg.io/documentation/current/database_import/) for different import types
   # * `microservice` - Single database import as expected from cnpg clusters
   # * `monolith` - Import multiple databases and roles
   importType: microservice
 
-  # If type microservice only one database is allowed, default is app as standard in cnpg clusters
+  # -- If type microservice only one database is allowed, default is app as standard in cnpg clusters
   importDatabases:
     - app
 
-  # If type microservice select the name for the imported database.
+  # -- If type microservice no roles are imported and ignored
-  importDatabaseName: app
-
-  # If type microservice no roles are imported and ignored
   importRoles: []
 
-  # If import type is monolith postImportApplicationSQL is not supported and ignored
+  # -- If import type is monolith postImportApplicationSQL is not supported and ignored
   postImportApplicationSQL: []
 
-  # External cluster connection, password specifies a secret name and the key containing the password value
+  # -- External cluster connection, password specifies a secret name and the key containing the password value
   externalCluster:
     connectionParameters:
       host: postgresql
@@ -161,48 +167,47 @@ replica:
 backup:
   enabled: false
 
-  # S3 endpoint starting with "https://"
+  # -- S3 endpoint starting with "https://"
   endpointURL: ""
 
-  # S3 path starting with "s3://"
+  # -- S3 path starting with "s3://"
   destinationPath: ""
 
-  # Specifies secret that contains a CA bundle to validate a privately signed certificate, should contain the key ca-bundle.crt
+  # -- Specifies secret that contains a CA bundle to validate a privately signed certificate, should contain the key ca-bundle.crt
   endpointCA: ""
 
-  # Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY
+  # -- Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY
   endpointCredentials: ""
 
-  # Generate external cluster name, creates: postgresql-{{ .Release.Name }}-cluster-backup-index-{{ .Values.backups.backupIndex }}"
+  # -- Generate external cluster name, creates: postgresql-{{ .Release.Name }}-cluster-backup-index-{{ .Values.backups.backupIndex }}"
   backupIndex: 1
 
-  # Name of the backup cluster in the object store, defaults to "cluster.name"
+  # -- Name of the backup cluster in the object store, defaults to "cluster.name"
   backupName: ""
 
-  # Tags to add to backups. Add in key value beneath the type.
+  # -- Tags to add to backups. Add in key value beneath the type.
   tags:
     backupRetentionPolicy: ""
   historyTags:
     backupRetentionPolicy: ""
 
-  # Configuration for the WAL and data files.
   wal:
-    # WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
+    # -- WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
     compression: snappy
-    # Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`.
+    # -- Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`.
     encryption: ""
-    # Number of WAL files to be archived or restored in parallel.
+    # -- Number of WAL files to be archived or restored in parallel.
     maxParallel: 2
   data:
-    # Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
+    # -- Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
     compression: snappy
-    # Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
+    # -- Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
     encryption: ""
-    # Number of data files to be archived or restored in parallel.
+    # -- Number of data files to be archived or restored in parallel.
     jobs: 2
 
-  # Retention policy for backups
+  # -- Retention policy for backups
   retentionPolicy: "14d"
 
-  # Scheduled backup in cron format
+  # -- Scheduled backup in cron format
   schedule: "0 0 0 * * *"