feat: simplify values.yaml by removing unnecessary comments and restructuring backup configurations

Author: Franck-Sorel

charts/cnpg-pgdump-backup/values.yaml

@@ -1,71 +1,52 @@
-## @section App Template Chart Values
 app-template:
-  ## @section Global Configuration
-  global:
-    # -- Full name override
-    fullnameOverride: ""
-    # -- Name override
-    nameOverride: ""
-    # -- Global labels applied to all resources
-    labels: {}
-      # app.kubernetes.io/part-of: cnpg-pgdump-backup
-    # -- Global annotations applied to all resources
-    annotations: {}
-      # description: "PostgreSQL backup and restore for CloudNativePG"
-
-  ## @section CNPG Cluster Configuration
   cnpg:
-    # -- Secret name containing CNPG connection details (must contain: host, port, username, password, dbname)
-    secretName: "litellm-pg-app"
+    secretName: litellm-pg-app
 
-  ## @section S3 Storage Configuration
   s3:
-    # -- REQUIRED: Secret name containing S3 credentials (created by Terraform with S3_* keys)
-    secretName: "open-web-ui-s3"
+    secretName: open-web-ui-s3
 
-  ## @section Restore Configuration
   restore:
-    # -- Enable restore Job (also set restore.object)
     enabled: false
-    # -- S3 object key to restore (empty = manual trigger required via --set)
     object: ""
 
-  ## @section Backup Controller (CronJob)
+  defaultPodOptions:
+    securityContext:
+      runAsNonRoot: true
+      runAsUser: 999
+      runAsGroup: 999
+      fsGroup: 999
+    terminationGracePeriodSeconds: 30
+
   controllers:
     backup:
-      # -- Enable scheduled backup CronJob
-      enabled: true
-      # -- Controller type
       type: cronjob
-      # -- CronJob specific settings
+      pod:
+        restartPolicy: OnFailure
       cronjob:
-        # -- CronJob schedule (default: daily at 1:35 PM)
         schedule: "35 13 * * *"
-        # -- Concurrency policy (Forbid, Replace, Allow)
         concurrencyPolicy: Forbid
-        # -- Number of successful jobs to keep
         successfulJobsHistory: 3
-        # -- Number of failed jobs to keep
         failedJobsHistory: 3
-        # -- Starting deadline seconds
         startingDeadlineSeconds: 30
-      pod:
-        # -- Pod security context
-        securityContext:
-          runAsNonRoot: true
-          runAsUser: 999
-          runAsGroup: 999
-          fsGroup: 999
-        # -- Restart policy
-        restartPolicy: OnFailure
-        # -- Termination grace period seconds
-        terminationGracePeriodSeconds: 30
       containers:
         backup:
           image:
             repository: ghcr.io/itbm/postgresql-backup-s3
             tag: latest
             pullPolicy: IfNotPresent
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
           env:
             - name: POSTGRES_HOST
               valueFrom:
@@ -107,66 +88,44 @@ app-template:
                 secretKeyRef:
                   name: "{{ .Values.s3.secretName }}"
                   key: S3_SECRET_ACCESS_KEY
-            # - name: AWS_SESSION_TOKEN
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: "{{ .Values.s3.secretName }}"
-            #       key: AWS_SESSION_TOKEN
             - name: S3_REGION
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.s3.secretName }}"
                   key: S3_REGION_NAME
-          # -- Container security context
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          # -- Resources
-          resources:
-            requests:
-              cpu: "100m"
-              memory: "256Mi"
-            limits:
-              cpu: "500m"
-              memory: "512Mi"
 
-    ## @section Restore Controller (Job)
     restore:
-      # -- Enable restore Job (also set restore.object)
       enabled: false
-      # -- Controller type
       type: job
-      # -- Job annotations
       annotations:
         helm.sh/hook: post-install
         helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
       job:
-        # -- TTL seconds after job finishes
         ttlSecondsAfterFinished: 300
-        # -- Backoff limit for job retries
         backoffLimit: 4
       pod:
-        # -- Pod security context
-        securityContext:
-          runAsNonRoot: true
-          runAsUser: 999
-          runAsGroup: 999
-          fsGroup: 999
-        # -- Restart policy
         restartPolicy: Never
-        # -- Termination grace period seconds
-        terminationGracePeriodSeconds: 30
       containers:
         restore:
           image:
             repository: ghcr.io/itbm/postgresql-backup-s3
             tag: latest
             pullPolicy: IfNotPresent
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
           command:
             - /restore.sh
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              cpu: 500m
+              memory: 1Gi
           env:
             - name: POSTGRES_HOST
               valueFrom:
@@ -208,30 +167,10 @@ app-template:
                 secretKeyRef:
                   name: "{{ .Values.s3.secretName }}"
                   key: S3_SECRET_ACCESS_KEY
-            # - name: AWS_SESSION_TOKEN
-            #   valueFrom:
-            #     secretKeyRef:
-            #       name: "{{ .Values.s3.secretName }}"
-            #       key: AWS_SESSION_TOKEN
             - name: S3_REGION
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.s3.secretName }}"
                   key: S3_REGION_NAME
             - name: BACKUP_FILE
               value: "{{ .Values.restore.object }}"
-          # -- Container security context
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          # -- Resources
-          resources:
-            requests:
-              cpu: "100m"
-              memory: "256Mi"
-            limits:
-              cpu: "500m"
-              memory: "1Gi"