From 5d6480489a7775797d1fc9b0d09195a88d5d76ac Mon Sep 17 00:00:00 2001 From: Sukanya Rath Date: Wed, 11 Dec 2024 12:29:26 -0800 Subject: [PATCH 1/3] chore: GEO-1265 remove limits from helm charts Signed-off-by: Sukanya Rath --- charts/fin-pay-transparency/values-dev.yaml | 32 ++++++------ charts/fin-pay-transparency/values-pr.yaml | 24 ++++----- charts/fin-pay-transparency/values-prod.yaml | 34 ++++++------ charts/fin-pay-transparency/values-test.yaml | 36 ++++++------- charts/fin-pay-transparency/values.yaml | 55 +++----------------- 5 files changed, 70 insertions(+), 111 deletions(-) diff --git a/charts/fin-pay-transparency/values-dev.yaml b/charts/fin-pay-transparency/values-dev.yaml index ebe1f59c..6feff3fc 100644 --- a/charts/fin-pay-transparency/values-dev.yaml +++ b/charts/fin-pay-transparency/values-dev.yaml @@ -82,8 +82,8 @@ backend: memory: 500Mi initResources: requests: - cpu: 150m - memory: 200Mi + cpu: 350m + memory: 250Mi autoscaling: enabled: true @@ -129,7 +129,7 @@ frontend: resources: requests: cpu: 50m - memory: 120Mi + memory: 150Mi env: logLevel: info autoscaling: @@ -181,7 +181,7 @@ crunchy: storage: 500Mi storageClassName: netapp-block-standard requests: - cpu: 100m + cpu: 200m memory: 256Mi replicaCertCopy: requests: @@ -216,19 +216,19 @@ crunchy: storageClassName: netapp-file-backup config: requests: - cpu: 10m - memory: 32Mi + cpu: 20m + memory: 64Mi repoHost: requests: - cpu: 10m + cpu: 20m memory: 64Mi sidecars: requests: - cpu: 10m - memory: 32Mi + cpu: 20m + memory: 64Mi jobs: requests: - cpu: 50m + cpu: 20m memory: 64Mi patroni: @@ -247,8 +247,8 @@ crunchy: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default replicas: 1 requests: - cpu: 5m - memory: 16Mi + cpu: 20m + memory: 32Mi # Postgres Cluster resource values: pgmonitor: @@ -256,8 +256,8 @@ crunchy: exporter: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default requests: - cpu: 25m - memory: 50Mi + cpu: 35m + memory: 32Mi doc-gen-service: enabled: true deploymentStrategy: Recreate @@ -277,8 +277,8 @@ doc-gen-service: targetPort: 3000 resources: requests: - cpu: 300m - memory: 500Mi + cpu: 600m + memory: 350Mi podSecurityContext: {} securityContext: {} diff --git a/charts/fin-pay-transparency/values-pr.yaml b/charts/fin-pay-transparency/values-pr.yaml index b6f21790..0becadc2 100644 --- a/charts/fin-pay-transparency/values-pr.yaml +++ b/charts/fin-pay-transparency/values-pr.yaml @@ -42,12 +42,12 @@ backend: deploymentStrategy: Recreate initResources: requests: - cpu: 150m - memory: 250Mi + cpu: 350m + memory: 500Mi resources: requests: - cpu: 50m - memory: 250Mi + cpu: 100m + memory: 500Mi storage: enabled: true size: 50Mi @@ -58,8 +58,8 @@ frontend: deploymentStrategy: Recreate resources: requests: - cpu: 15m - memory: 50Mi + cpu: 30m + memory: 150Mi env: logLevel: info pdb: false @@ -68,8 +68,8 @@ admin-frontend: deploymentStrategy: Recreate resources: requests: - cpu: 15m - memory: 100Mi + cpu: 30m + memory: 150Mi env: logLevel: info pdb: false @@ -95,8 +95,8 @@ database: affinity: {} resources: requests: - cpu: 50m - memory: 100Mi + cpu: 150m + memory: 250Mi persistence: enabled: true size: 80Mi @@ -125,8 +125,8 @@ doc-gen-service: targetPort: 3000 resources: requests: - cpu: 50m - memory: 250Mi + cpu: 300m + memory: 350Mi podSecurityContext: {} securityContext: {} diff --git a/charts/fin-pay-transparency/values-prod.yaml b/charts/fin-pay-transparency/values-prod.yaml index 629a743e..da265325 100644 --- a/charts/fin-pay-transparency/values-prod.yaml +++ b/charts/fin-pay-transparency/values-prod.yaml @@ -78,12 +78,12 @@ backend: targetPort: 3000 resources: requests: - cpu: 150m + cpu: 200m memory: 600Mi initResources: requests: - cpu: 150m - memory: 200Mi + cpu: 200m + memory: 250Mi autoscaling: enabled: true @@ -130,7 +130,7 @@ frontend: resources: requests: cpu: 50m - memory: 120Mi + memory: 150Mi env: logLevel: info snowplowUrl: spt.apps.gov.bc.ca @@ -185,11 +185,11 @@ crunchy: storage: 600Mi storageClassName: netapp-block-standard requests: - cpu: 100m - memory: 300Mi + cpu: 200m + memory: 256Mi replicaCertCopy: requests: - cpu: 5m + cpu: 20m memory: 32Mi pgBackRest: @@ -220,19 +220,19 @@ crunchy: config: requests: - cpu: 5m - memory: 32Mi + cpu: 20m + memory: 64Mi repoHost: requests: - cpu: 50m + cpu: 200m memory: 256Mi sidecars: requests: - cpu: 10m - memory: 32Mi + cpu: 20m + memory: 64Mi jobs: requests: - cpu: 100m + cpu: 200m memory: 256Mi patroni: postgresql: @@ -250,7 +250,7 @@ crunchy: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default replicas: 1 requests: - cpu: 5m + cpu: 20m memory: 32Mi # Postgres Cluster resource values: @@ -259,7 +259,7 @@ crunchy: exporter: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default requests: - cpu: 25m + cpu: 35m memory: 32Mi doc-gen-service: enabled: true @@ -280,8 +280,8 @@ doc-gen-service: targetPort: 3000 resources: requests: - cpu: 500m - memory: 400Mi + cpu: 650m + memory: 350Mi podSecurityContext: {} securityContext: {} diff --git a/charts/fin-pay-transparency/values-test.yaml b/charts/fin-pay-transparency/values-test.yaml index 02075513..9e68b21c 100644 --- a/charts/fin-pay-transparency/values-test.yaml +++ b/charts/fin-pay-transparency/values-test.yaml @@ -79,11 +79,11 @@ backend: resources: requests: cpu: 150m - memory: 500Mi + memory: 300Mi initResources: requests: cpu: 150m - memory: 300Mi + memory: 250Mi autoscaling: enabled: true @@ -128,8 +128,8 @@ frontend: targetPort: 3000 resources: requests: - cpu: 30m - memory: 120Mi + cpu: 50m + memory: 150Mi env: logLevel: info autoscaling: @@ -177,11 +177,11 @@ crunchy: storage: 4000Mi storageClassName: netapp-block-standard requests: - cpu: 100m + cpu: 200m memory: 256Mi replicaCertCopy: requests: - cpu: 15m + cpu: 20m memory: 32Mi pgBackRest: @@ -212,19 +212,19 @@ crunchy: config: requests: - cpu: 5m - memory: 32Mi + cpu: 20m + memory: 64Mi repoHost: requests: - cpu: 15m + cpu: 20m memory: 64Mi sidecars: requests: - cpu: 5m - memory: 32Mi + cpu: 20m + memory: 64Mi jobs: requests: - cpu: 50m + cpu: 20m memory: 64Mi patroni: postgresql: @@ -242,8 +242,8 @@ crunchy: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default replicas: 1 requests: - cpu: 5m - memory: 16Mi + cpu: 20m + memory: 32Mi # Postgres Cluster resource values: pgmonitor: @@ -251,8 +251,8 @@ crunchy: exporter: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default requests: - cpu: 25m - memory: 50Mi + cpu: 35m + memory: 32Mi doc-gen-service: enabled: true deploymentStrategy: Recreate @@ -272,8 +272,8 @@ doc-gen-service: targetPort: 3000 resources: requests: - cpu: 300m - memory: 500Mi + cpu: 600m + memory: 350Mi podSecurityContext: {} securityContext: {} diff --git a/charts/fin-pay-transparency/values.yaml b/charts/fin-pay-transparency/values.yaml index 4ebf31b7..357509be 100644 --- a/charts/fin-pay-transparency/values.yaml +++ b/charts/fin-pay-transparency/values.yaml @@ -79,19 +79,13 @@ backend: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 150m memory: 250Mi - requests: - cpu: 50m - memory: 100Mi initResources: - limits: + requests: cpu: 350m memory: 250Mi - requests: - cpu: 150m - memory: 100Mi autoscaling: enabled: true @@ -136,12 +130,9 @@ frontend: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 50m memory: 150Mi - requests: - cpu: 15m - memory: 50Mi env: logLevel: info snowplowUrl: spm.apps.gov.bc.ca @@ -244,19 +235,14 @@ crunchy: storage: 500Mi storageClassName: netapp-block-standard requests: - cpu: 50m - memory: 128Mi - limits: cpu: 200m memory: 256Mi replicaCertCopy: requests: - cpu: 5m - memory: 16Mi - limits: cpu: 20m memory: 32Mi + pgBackRest: enabled: true backupPath: /backups/cluster/version @@ -284,30 +270,18 @@ crunchy: storageClassName: netapp-file-backup config: requests: - cpu: 5m - memory: 32Mi - limits: cpu: 20m memory: 64Mi repoHost: requests: - cpu: 5m - memory: 32Mi - limits: cpu: 20m memory: 64Mi sidecars: requests: - cpu: 5m - memory: 16Mi - limits: cpu: 20m memory: 64Mi jobs: requests: - cpu: 5m - memory: 16Mi - limits: cpu: 20m memory: 64Mi @@ -327,9 +301,6 @@ crunchy: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default replicas: 1 requests: - cpu: 5m - memory: 16Mi - limits: cpu: 20m memory: 32Mi @@ -339,9 +310,6 @@ crunchy: exporter: image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default requests: - cpu: 5m - memory: 16Mi - limits: cpu: 35m memory: 32Mi doc-gen-service: @@ -362,12 +330,9 @@ doc-gen-service: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 650m memory: 350Mi - requests: - cpu: 100m - memory: 50Mi podSecurityContext: {} securityContext: {} @@ -393,12 +358,9 @@ backend-external: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 20m memory: 150Mi - requests: - cpu: 10m - memory: 50Mi app: env: logLevel: info @@ -415,9 +377,6 @@ maintenance: image: tag: ~ resources: - limits: + requests: cpu: 30m memory: 100Mi - requests: - cpu: 10m - memory: 30Mi From df861c3f041925b202813c531ff15b785a4ea537 Mon Sep 17 00:00:00 2001 From: Sukanya Rath Date: Wed, 11 Dec 2024 12:35:26 -0800 Subject: [PATCH 2/3] chore: GEO-1265 remove limits from helm charts Signed-off-by: Sukanya Rath --- charts/fin-pay-transparency/values-pr.yaml | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/fin-pay-transparency/values-pr.yaml b/charts/fin-pay-transparency/values-pr.yaml index 0becadc2..4f500992 100644 --- a/charts/fin-pay-transparency/values-pr.yaml +++ b/charts/fin-pay-transparency/values-pr.yaml @@ -42,12 +42,12 @@ backend: deploymentStrategy: Recreate initResources: requests: - cpu: 350m - memory: 500Mi + cpu: 150m + memory: 250Mi resources: requests: - cpu: 100m - memory: 500Mi + cpu: 50m + memory: 250Mi storage: enabled: true size: 50Mi @@ -58,8 +58,8 @@ frontend: deploymentStrategy: Recreate resources: requests: - cpu: 30m - memory: 150Mi + cpu: 15m + memory: 50Mi env: logLevel: info pdb: false @@ -68,8 +68,8 @@ admin-frontend: deploymentStrategy: Recreate resources: requests: - cpu: 30m - memory: 150Mi + cpu: 15m + memory: 50Mi env: logLevel: info pdb: false @@ -95,8 +95,8 @@ database: affinity: {} resources: requests: - cpu: 150m - memory: 250Mi + cpu: 30m + memory: 100Mi persistence: enabled: true size: 80Mi @@ -125,8 +125,8 @@ doc-gen-service: targetPort: 3000 resources: requests: - cpu: 300m - memory: 350Mi + cpu: 50m + memory: 150Mi podSecurityContext: {} securityContext: {} From f535bba788a4bcf23d99c0cb63b0d27286e37477 Mon Sep 17 00:00:00 2001 From: Sukanya Rath Date: Wed, 11 Dec 2024 12:53:16 -0800 Subject: [PATCH 3/3] chore: GEO-1265 remove limits from helm charts Signed-off-by: Sukanya Rath --- .../templates/PostgresCluster.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml b/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml index 0b84ea75..8d0e5264 100644 --- 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" @@ -164,17 +155,11 @@ spec: 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: @@ -212,9 +197,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: