From 694756815f91cbf2c2a4199ca0bb926fa8f3b341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Fri, 20 Mar 2026 09:47:44 +0000
Subject: [PATCH] normalization of backups jobs names

---
 ...org-offsite-cronjob.yaml => backup-borg-offsite.yaml} | 6 +++---
 .../cronjobs/{pbs-cronjob.yaml => backup-pbs.yaml}       | 6 +++---
 deploy/backups/kustomization.yaml                        | 4 ++--
 ops-scripts/apply-app.sh                                 | 9 +++++++--
 4 files changed, 15 insertions(+), 10 deletions(-)
 rename deploy/backups/cronjobs/{borg-offsite-cronjob.yaml => backup-borg-offsite.yaml} (98%)
 rename deploy/backups/cronjobs/{pbs-cronjob.yaml => backup-pbs.yaml} (97%)

diff --git a/deploy/backups/cronjobs/borg-offsite-cronjob.yaml b/deploy/backups/cronjobs/backup-borg-offsite.yaml
similarity index 98%
rename from deploy/backups/cronjobs/borg-offsite-cronjob.yaml
rename to deploy/backups/cronjobs/backup-borg-offsite.yaml
index a6b6edd..cd15fa2 100644
--- a/deploy/backups/cronjobs/borg-offsite-cronjob.yaml
+++ b/deploy/backups/cronjobs/backup-borg-offsite.yaml
@@ -12,11 +12,11 @@ spec:
       template:
         metadata:
           labels:
-            app: offsite-backup
+            app: backup-borg-offsite
         spec:
           restartPolicy: Never
           initContainers:
-            - name: postgres-export
+            - name: postgres
               resources:
                 limits:
                   memory: "512Mi"
@@ -46,7 +46,7 @@ spec:
 
      
           containers:
-            - name: borg-client
+            - name: borg-backup
               image: git.limbosolutions.com/kb/borg-backup:latest
               imagePullPolicy: Always
               resources:
diff --git a/deploy/backups/cronjobs/pbs-cronjob.yaml b/deploy/backups/cronjobs/backup-pbs.yaml
similarity index 97%
rename from deploy/backups/cronjobs/pbs-cronjob.yaml
rename to deploy/backups/cronjobs/backup-pbs.yaml
index f9f6df8..154091d 100644
--- a/deploy/backups/cronjobs/pbs-cronjob.yaml
+++ b/deploy/backups/cronjobs/backup-pbs.yaml
@@ -11,11 +11,11 @@ spec:
       template:
         metadata:
           labels:
-            app: pbs-backup
+            app: backup-pbs
         spec:
           restartPolicy: Never
           initContainers:
-            - name: postgres-export
+            - name: postgres
               image: postgres:latest
               resources:
                 limits:
@@ -49,7 +49,7 @@ spec:
                 readOnly: true
 
           containers:
-            - name: gitea-pbs-client
+            - name: pbs-client
               image: git.limbosolutions.com/kb/pbs-client
               imagePullPolicy: Always
               resources:
diff --git a/deploy/backups/kustomization.yaml b/deploy/backups/kustomization.yaml
index 8353ca8..9746b4a 100644
--- a/deploy/backups/kustomization.yaml
+++ b/deploy/backups/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - cronjobs/borg-offsite-cronjob.yaml
-  - cronjobs/pbs-cronjob.yaml
+  - cronjobs/backup-borg-offsite.yaml
+  - cronjobs/backup-pbs.yaml
 
 secretGenerator:
 - name: gitea-backup
diff --git a/ops-scripts/apply-app.sh b/ops-scripts/apply-app.sh
index 5a5c37c..4c44b50 100755
--- a/ops-scripts/apply-app.sh
+++ b/ops-scripts/apply-app.sh
@@ -1,5 +1,6 @@
 #/bin/bash
-kubectl kustomize deploy/backups | kubectl apply -f -
+
+# load environment variables from file
 
 if [ -f "deploy/app/.env.d/.env" ]; then
   # Export all variables from the file
@@ -10,7 +11,8 @@ if [ -f "deploy/app/.env.d/.env" ]; then
 fi
 
 if [ -n "${APP_HELM_VALUE_GITEA_ADMIN_USERNAME:-}" ]; then
-  echo "Executing helm deploy."
+
+    echo "Executing helm deploy."
 
     helm repo add gitea-charts https://dl.gitea.com/charts/ --force-update
 
@@ -32,4 +34,7 @@ if [ -n "${APP_HELM_VALUE_GITEA_ADMIN_USERNAME:-}" ]; then
     --set gitea.config.security.PASSWORD_HASH_ALGO=${APP_HELM_VALUE_GITEA_CONFIG_SECURITY_PASSWORD_HASH_ALGO} \
     --set gitea.config.service.oauth2.JWT_SECRET=${APP_HELM_VALUE_GITEA_CONFIG_SERVICE_OAUTH2_JWT_SECRET} \
     --namespace=git-limbosolutions-com
+
+    echo "executing deploy of backups jobs."
+    kubectl kustomize deploy/backups | kubectl apply -f -
 fi
\ No newline at end of file