Merge branch 'main' into fix/api-utc-dates

bcgov · Dec 12, 2024 · 80271d3 · 80271d3
2 parents c8ef9aa + ab39e1c
commit 80271d3
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 444 deletions.
diff --git a/admin-frontend/openshift.deploy.yml b/admin-frontend/openshift.deploy.yml
diff --git a/admin-frontend/package-lock.json b/admin-frontend/package-lock.json
diff --git a/admin-frontend/package.json b/admin-frontend/package.json
@@ -125,7 +125,7 @@
   },
   "overrides": {
     "[email protected]": {
-      "axios": "1.7.8"
+      "axios": "1.7.9"
     }
   }
 }
diff --git a/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml b/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml
@@ -46,9 +46,6 @@ spec:
           requests:
             cpu: {{ .Values.pgmonitor.exporter.requests.cpu }}
             memory: {{ .Values.pgmonitor.exporter.requests.memory }}
-          limits:
-            cpu: {{ .Values.pgmonitor.exporter.limits.cpu }}
-            memory: {{ .Values.pgmonitor.exporter.limits.memory }}
 
   {{ end }}
 
@@ -63,18 +60,12 @@ spec:
         requests:
           cpu: {{ .Values.instances.requests.cpu }}
           memory: {{ .Values.instances.requests.memory }}
-        limits:
-          cpu: {{ .Values.instances.limits.cpu }}
-          memory: {{ .Values.instances.limits.memory }}
       sidecars:
         replicaCertCopy:
           resources:
             requests:
               cpu: {{ .Values.instances.replicaCertCopy.requests.cpu }}
               memory: {{ .Values.instances.replicaCertCopy.requests.memory }}
-            limits:
-              cpu: {{ .Values.instances.replicaCertCopy.limits.cpu }}
-              memory: {{ .Values.instances.replicaCertCopy.limits.memory }}
       dataVolumeClaimSpec:
         accessModes:
           - "ReadWriteOnce"
@@ -154,35 +145,23 @@ spec:
           requests:
             cpu: {{ .Values.pgBackRest.repoHost.requests.cpu }}
             memory: {{ .Values.pgBackRest.repoHost.requests.memory }}
-          limits:
-            cpu: {{ .Values.pgBackRest.repoHost.limits.cpu }}
-            memory: {{ .Values.pgBackRest.repoHost.limits.memory }}
       sidecars:
         # this stuff is for the "pgbackrest" container in the "postgres-crunchy-ha" set of pods
         pgbackrest:
           resources:
             requests:
               cpu: {{ .Values.pgBackRest.sidecars.requests.cpu }}
               memory: {{ .Values.pgBackRest.sidecars.requests.memory }}
-            limits:
-              cpu: {{ .Values.pgBackRest.sidecars.limits.cpu }}
-              memory: {{ .Values.pgBackRest.sidecars.limits.memory }}
         pgbackrestConfig:
           resources:
             requests:
               cpu: {{ .Values.pgBackRest.sidecars.requests.cpu }}
               memory: {{ .Values.pgBackRest.sidecars.requests.memory }}
-            limits:
-              cpu: {{ .Values.pgBackRest.sidecars.limits.cpu }}
-              memory: {{ .Values.pgBackRest.sidecars.limits.memory }}
       jobs:
         resources:
           requests:
             cpu: {{ .Values.pgBackRest.jobs.requests.cpu }}
             memory: {{ .Values.pgBackRest.jobs.requests.memory }}
-          limits:
-            cpu: {{ .Values.pgBackRest.jobs.limits.cpu }}
-            memory: {{ .Values.pgBackRest.jobs.limits.memory }}
   {{- end }}
   patroni:
     dynamicConfiguration:
@@ -212,9 +191,6 @@ spec:
         requests:
           cpu: {{ .Values.proxy.pgBouncer.requests.cpu }}
           memory: {{ .Values.proxy.pgBouncer.requests.memory }}
-        limits:
-          cpu: {{ .Values.proxy.pgBouncer.limits.cpu }}
-          memory: {{ .Values.proxy.pgBouncer.limits.memory }}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution: