update resource values

bcgov · Oct 22, 2024 · fcb711d · fcb711d
1 parent cdc2a21
commit fcb711d
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 72 deletions.
diff --git a/.github/environments/values.dev.yaml b/.github/environments/values.dev.yaml
@@ -36,20 +36,20 @@ postgres:
   instances:
     - name: db # do not change this name after initial install, pvc (data) and stateful sets will be deleted
       replicas: 3
-      dataVolumeClaimSpec:
-        accessModes:
-          - "ReadWriteOnce"
-        storageClassName: "netapp-block-standard"
-        resources:
-          requests:
-            storage: 3Gi
-      resources:
-        requests:
-          cpu: 1m
-          memory: 256Mi
-        limits:
-          cpu: 100m
-          memory: 512Mi
+      # dataVolumeClaimSpec:
+      #   accessModes:
+      #     - "ReadWriteOnce"
+      #   storageClassName: "netapp-block-standard"
+      #   resources:
+      #     requests:
+      #       storage: 1Gi
+      # resources:
+      #   requests:
+      #     cpu: 50m
+      #     memory: 128Mi
+      #   limits:
+      #     cpu: 100m
+      #     memory: 256Mi
 
   # -------- backups ---------
   pgBackRestConfig:

diff --git a/.github/environments/values.pr.yaml b/.github/environments/values.pr.yaml
@@ -15,20 +15,20 @@ postgres:
   instances:
     - name: db # do not change this name after initial install, pvc (data) and stateful sets will be deleted
       replicas: 1
-      dataVolumeClaimSpec:
-        accessModes:
-          - "ReadWriteOnce"
-        storageClassName: "netapp-block-standard"
-        resources:
-          requests:
-            storage: 1Gi
-      resources:
-        requests:
-          cpu: 1m
-          memory: 128Mi
-        limits:
-          cpu: 50m
-          memory: 256Mi
+      # dataVolumeClaimSpec:
+      #   accessModes:
+      #     - "ReadWriteOnce"
+      #   storageClassName: "netapp-block-standard"
+      #   resources:
+      #     requests:
+      #       storage: 1Gi
+      # resources:
+      #   requests:
+      #     cpu: 1m
+      #     memory: 128Mi
+      #   limits:
+      #     cpu: 50m
+      #     memory: 256Mi
 
   # -------- backups ---------
   pgBackRestConfig: {}
diff --git a/.github/environments/values.prod.yaml b/.github/environments/values.prod.yaml
@@ -87,9 +87,17 @@ postgres:
           endpoint: https://nrs.objectstore.gov.bc.ca
           region: us-east-1
 
-  # ----- pgBouncer (network pooling) ------
-  pgBouncerConfig:
-    replicas: 2
+  # # ----- pgBouncer (network pooling) ------
+  # pgBouncerConfig:
+  #   replicas: 2
 
   # -------- monitoring ---------
   monitoring: true
+  monitoringConfig:
+  resources:
+    requests:
+      cpu: 1m
+      memory: 16Mi
+    limits:
+      cpu: 35m
+      memory: 32Mi
diff --git a/.github/environments/values.test.yaml b/.github/environments/values.test.yaml
@@ -36,20 +36,20 @@ postgres:
   instances:
     - name: db # do not change this name after initial install, pvc (data) and stateful sets will be deleted
       replicas: 3
-      dataVolumeClaimSpec:
-        accessModes:
-          - "ReadWriteOnce"
-        storageClassName: "netapp-block-standard"
-        resources:
-          requests:
-            storage: 5Gi
-      resources:
-        requests:
-          cpu: 1m
-          memory: 64Mi
-        limits:
-          cpu: 100m
-          memory: 128Mi
+      # dataVolumeClaimSpec:
+      #   accessModes:
+      #     - "ReadWriteOnce"
+      #   storageClassName: "netapp-block-standard"
+      #   resources:
+      #     requests:
+      #       storage: 5Gi
+      # resources:
+      #   requests:
+      #     cpu: 1m
+      #     memory: 64Mi
+      #   limits:
+      #     cpu: 100m
+      #     memory: 128Mi
 
   # -------- backups ---------
   pgBackRestConfig:
@@ -72,6 +72,6 @@ postgres:
                 storage: 2Gi
             storageClassName: "netapp-file-backup"
 
-  # ----- pgBouncer (network pooling) ------
-  pgBouncerConfig:
-    replicas: 2
+  # # ----- pgBouncer (network pooling) ------
+  # pgBouncerConfig:
+  #   replicas: 2
diff --git a/charts/coms/Chart.yaml b/charts/coms/Chart.yaml
@@ -3,7 +3,7 @@ name: common-object-management-service
 # 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: 1.1.2
+version: 1.1.3
 kubeVersion: ">= 1.13.0"
 description: A microservice for managing access control to S3 Objects
 # A chart can be either an 'application' or a 'library' chart.
@@ -28,7 +28,7 @@ sources:
   - https://github.com/bcgov/common-object-management-service
 dependencies:
   - name: postgrescluster
-    version: 1.1.2
+    version: 1.1.3
     repository: "file://../postgres"
     condition: postgres.enabled
     alias: postgres

diff --git a/charts/coms/values.yaml b/charts/coms/values.yaml
@@ -110,7 +110,7 @@ resources:
     # -- Limit Peak CPU (in millicores ex. 1000m)
     cpu: 200m
     # -- Limit Peak Memory (in gigabytes Gi or megabytes Mi ex. 2Gi)
-    memory: 512Mi
+    memory: 256Mi
   requests:
     # -- Requested CPU (in millicores ex. 500m)
     cpu: 50m
@@ -217,15 +217,24 @@ postgres:
           - "ReadWriteOnce"
         resources:
           requests:
-            storage: 2Gi
+            storage: 0.5Gi
         storageClassName: "netapp-block-standard"
       resources:
         requests:
-          cpu: 1m
-          memory: 256Mi
+          cpu: 50m
+          memory: 128Mi
         limits:
           cpu: 100m
-          memory: 512Mi
+          memory: 256Mi
+      sidecars:
+        replicaCertCopy:
+          resources:
+            requests:
+              cpu: 1m
+              memory: 32Mi
+            limits:
+              cpu: 50m
+              memory: 64Mi
 
   # ------- postgres user/db configuration ----------
   users:
@@ -258,35 +267,42 @@ postgres:
     repoHost:
       resources:
         requests:
-          cpu: 1m
-          memory: 64Mi
+          cpu: 20m
+          memory: 128Mi
         limits:
           cpu: 50m
-          memory: 128Mi
+          memory: 256Mi
     sidecars:
       pgbackrest:
         resources:
           requests:
-            cpu: 1m
-            memory: 64Mi
+            cpu: 5m
+            memory: 16Mi
           limits:
-            cpu: 50m
-            memory: 128Mi
+            cpu: 20m
+            memory: 64Mi
+    jobs:
+      resources:
+        requests:
+          cpu: 10m
+          memory: 64Mi
+        limits:
+          cpu: 50m
+          memory: 128Mi
 
   # ----- pgBouncer (network pooling) ------
   pgBouncerConfig:
-    replicas: 1
+    replicas: 2
     config:
       global:
         client_tls_sslmode: disable
-
-  # -------- monitoring ----------
-  monitoring: false
-  monitoringConfig:
     resources:
       requests:
-        cpu: 1m
-        memory: 64Mi
+        cpu: 5m
+        memory: 32Mi
       limits:
-        cpu: 50m
-        memory: 128Mi
+        cpu: 20m
+        memory: 64Mi
+
+  # -------- monitoring ----------
+  monitoring: false
diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
@@ -3,5 +3,5 @@ name: postgrescluster
 description: A Helm chart for Kubernetes
 type: application
 # The version below should match the version on the PostgresCluster CRD
-version: 1.1.2
+version: 1.1.3
 appVersion: 5.6.0