From 8e79f24c5ba40421514cf30203f965250140fcaa Mon Sep 17 00:00:00 2001
From: kklinch0 <kklinch0@gmail.com>
Date: Wed, 11 Jun 2025 22:48:00 +0300
Subject: [PATCH] add rq for pg

Signed-off-by: kklinch0 <kklinch0@gmail.com>
---
 .github/workflows/pre-commit.yml                     |  7 ++++---
 hack/e2e-cluster.bats                                |  2 +-
 packages/apps/postgres/Chart.yaml                    |  2 +-
 packages/apps/postgres/templates/_postgresjobs.tpl   | 11 +++++++++++
 packages/apps/postgres/templates/backup-cronjob.yaml |  1 +
 packages/apps/postgres/templates/init-job.yaml       |  1 +
 packages/apps/versions_map                           |  3 ++-
 7 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 packages/apps/postgres/templates/_postgresjobs.tpl

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 65c48051..7f41ffd8 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -30,12 +30,13 @@ jobs:
         run: |
           sudo apt update
           sudo apt install curl -y
-          curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
           sudo apt install nodejs -y
-          git clone https://github.com/bitnami/readme-generator-for-helm
+          sudo apt install npm -y
+
+          git clone --branch 2.7.0 --depth 1 https://github.com/bitnami/readme-generator-for-helm.git
           cd ./readme-generator-for-helm
           npm install
-          npm install -g pkg
+          npm install -g @yao-pkg/pkg
           pkg . -o /usr/local/bin/readme-generator
 
       - name: Run pre-commit hooks
diff --git a/hack/e2e-cluster.bats b/hack/e2e-cluster.bats
index 73a0f9f8..bc2df498 100755
--- a/hack/e2e-cluster.bats
+++ b/hack/e2e-cluster.bats
@@ -102,7 +102,7 @@ EOF
 
 @test "Boot QEMU VMs" {
   for i in 1 2 3; do
-    qemu-system-x86_64 -machine type=pc,accel=kvm -cpu host -smp 8 -m 16384 \
+    qemu-system-x86_64 -machine type=pc,accel=kvm -cpu host -smp 8 -m 24576 \
       -device virtio-net,netdev=net0,mac=52:54:00:12:34:5${i} \
       -netdev tap,id=net0,ifname=cozy-srv${i},script=no,downscript=no \
       -drive file=srv${i}/system.img,if=virtio,format=raw \
diff --git a/packages/apps/postgres/Chart.yaml b/packages/apps/postgres/Chart.yaml
index 5d470f8c..d437b11d 100644
--- a/packages/apps/postgres/Chart.yaml
+++ b/packages/apps/postgres/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.1
+version: 0.13.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/packages/apps/postgres/templates/_postgresjobs.tpl b/packages/apps/postgres/templates/_postgresjobs.tpl
new file mode 100644
index 00000000..087948ce
--- /dev/null
+++ b/packages/apps/postgres/templates/_postgresjobs.tpl
@@ -0,0 +1,11 @@
+{{/*
+Generate resource requirements based on ResourceQuota named as the namespace.
+*/}}
+{{- define "postgresjobs.defaultResources" }}
+cpu: "1"
+memory: 512Mi
+{{- end }}
+{{- define "postgresjobs.resources" }}
+resources:
+{{ include "cozy-lib.resources.sanitize" (list (include "postgresjobs.defaultResources" $ | fromYaml) $) | nindent 2 }}
+{{- end }}
diff --git a/packages/apps/postgres/templates/backup-cronjob.yaml b/packages/apps/postgres/templates/backup-cronjob.yaml
index 1998357a..233f020a 100644
--- a/packages/apps/postgres/templates/backup-cronjob.yaml
+++ b/packages/apps/postgres/templates/backup-cronjob.yaml
@@ -81,6 +81,7 @@ spec:
               privileged: false
               readOnlyRootFilesystem: true
               runAsNonRoot: true
+            {{- include "postgresjobs.resources" . | nindent 12 }}
           volumes:
           - name: scripts
             secret:
diff --git a/packages/apps/postgres/templates/init-job.yaml b/packages/apps/postgres/templates/init-job.yaml
index 8b17a2c1..f6c42dbd 100644
--- a/packages/apps/postgres/templates/init-job.yaml
+++ b/packages/apps/postgres/templates/init-job.yaml
@@ -50,6 +50,7 @@ spec:
           name: secret
         - mountPath: /scripts
           name: scripts
+        {{- include "postgresjobs.resources" . | nindent 8 }}
       securityContext:
         fsGroup: 26
         runAsGroup: 26
diff --git a/packages/apps/versions_map b/packages/apps/versions_map
index f40d6f20..1474dc08 100644
--- a/packages/apps/versions_map
+++ b/packages/apps/versions_map
@@ -109,7 +109,8 @@ postgres 0.10.0 721c12a7
 postgres 0.10.1 93bdf411
 postgres 0.11.0 f9f8bb2f
 postgres 0.12.0 6130f43d
-postgres 0.12.1 HEAD
+postgres 0.12.1 632224a3
+postgres 0.13.0 HEAD
 rabbitmq 0.1.0 263e47be
 rabbitmq 0.2.0 53f2365e
 rabbitmq 0.3.0 6c5cf5bf