From 5a2d3972fbb1459d34596e7a998f5aafeae1f7c5 Mon Sep 17 00:00:00 2001 From: Sukanya Rath Date: Tue, 10 Dec 2024 20:10:00 -0800 Subject: [PATCH] chore: resource adjustment, remove limits as it is now removed from platform. Signed-off-by: Sukanya Rath --- charts/fin-pay-transparency/values-dev.yaml | 76 +++++------------- charts/fin-pay-transparency/values-pr.yaml | 26 +------ charts/fin-pay-transparency/values-prod.yaml | 69 ++++------------- charts/fin-pay-transparency/values-test.yaml | 81 +++++--------------- charts/fin-pay-transparency/values.yaml | 7 +- 5 files changed, 60 insertions(+), 199 deletions(-) diff --git a/charts/fin-pay-transparency/values-dev.yaml b/charts/fin-pay-transparency/values-dev.yaml index e4c490f3f..ebe1f59ca 100644 --- a/charts/fin-pay-transparency/values-dev.yaml +++ b/charts/fin-pay-transparency/values-dev.yaml @@ -77,23 +77,17 @@ backend: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 150m memory: 500Mi - requests: - cpu: 50m - memory: 250Mi initResources: - limits: - cpu: 350m - memory: 250Mi requests: cpu: 150m - memory: 100Mi + memory: 200Mi autoscaling: enabled: true - minReplicas: 3 + minReplicas: 2 maxReplicas: 5 targetCPUUtilizationPercentage: 60 # this percentage from request cpu storage: @@ -133,17 +127,14 @@ frontend: port: 80 targetPort: 3000 resources: - limits: - cpu: 50m - memory: 150Mi requests: - cpu: 15m - memory: 50Mi + cpu: 50m + memory: 120Mi env: logLevel: info autoscaling: enabled: true - minReplicas: 3 + minReplicas: 2 maxReplicas: 5 targetCPUUtilizationPercentage: 80 # this percentage from request cpu podSecurityContext: {} @@ -158,7 +149,6 @@ admin-frontend: env: isAdminDashboardAvailable: true isAdminAnalyticsAvailable: true - isAdminAnalyticsAvailable: true database: enabled: false crunchy: @@ -186,21 +176,15 @@ crunchy: annotations: prometheus.io/scrape: "true" prometheus.io/port: "9187" - replicas: 3 + replicas: 2 dataVolumeClaimSpec: storage: 500Mi storageClassName: netapp-block-standard requests: - cpu: 50m - memory: 128Mi - limits: - cpu: 200m + cpu: 100m memory: 256Mi replicaCertCopy: requests: - cpu: 5m - memory: 16Mi - limits: cpu: 20m memory: 32Mi @@ -232,31 +216,19 @@ crunchy: storageClassName: netapp-file-backup config: requests: - cpu: 5m + cpu: 10m memory: 32Mi - limits: - cpu: 20m - memory: 64Mi repoHost: requests: - cpu: 5m - memory: 32Mi - limits: - cpu: 20m + cpu: 10m memory: 64Mi sidecars: requests: - cpu: 5m - memory: 16Mi - limits: - cpu: 20m - memory: 64Mi + cpu: 10m + memory: 32Mi jobs: requests: - cpu: 5m - memory: 16Mi - limits: - cpu: 20m + cpu: 50m memory: 64Mi patroni: @@ -277,9 +249,6 @@ crunchy: requests: cpu: 5m memory: 16Mi - limits: - cpu: 20m - memory: 32Mi # Postgres Cluster resource values: pgmonitor: @@ -287,11 +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: 5m - memory: 16Mi - limits: - cpu: 35m - memory: 32Mi + cpu: 25m + memory: 50Mi doc-gen-service: enabled: true deploymentStrategy: Recreate @@ -310,12 +276,9 @@ doc-gen-service: port: 80 targetPort: 3000 resources: - limits: - cpu: 600m - memory: 350Mi requests: - cpu: 100m - memory: 50Mi + cpu: 300m + memory: 500Mi podSecurityContext: {} securityContext: {} @@ -341,12 +304,9 @@ backend-external: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 20m memory: 150Mi - requests: - cpu: 10m - memory: 50Mi app: env: logLevel: info diff --git a/charts/fin-pay-transparency/values-pr.yaml b/charts/fin-pay-transparency/values-pr.yaml index 977acedaf..b6f217908 100644 --- a/charts/fin-pay-transparency/values-pr.yaml +++ b/charts/fin-pay-transparency/values-pr.yaml @@ -41,16 +41,10 @@ global: backend: deploymentStrategy: Recreate initResources: - limits: - cpu: 350m - memory: 500Mi requests: cpu: 150m memory: 250Mi resources: - limits: - cpu: 100m - memory: 500Mi requests: cpu: 50m memory: 250Mi @@ -63,9 +57,6 @@ backend: frontend: deploymentStrategy: Recreate resources: - limits: - cpu: 30m - memory: 150Mi requests: cpu: 15m memory: 50Mi @@ -76,12 +67,9 @@ frontend: admin-frontend: deploymentStrategy: Recreate resources: - limits: - cpu: 30m - memory: 150Mi requests: cpu: 15m - memory: 50Mi + memory: 100Mi env: logLevel: info pdb: false @@ -106,11 +94,8 @@ database: tolerations: [] affinity: {} resources: - limits: - cpu: 150m - memory: 250Mi requests: - cpu: 30m + cpu: 50m memory: 100Mi persistence: enabled: true @@ -139,12 +124,9 @@ doc-gen-service: port: 80 targetPort: 3000 resources: - limits: - cpu: 300m - memory: 350Mi requests: - cpu: 30m - memory: 50Mi + cpu: 50m + memory: 250Mi podSecurityContext: {} securityContext: {} diff --git a/charts/fin-pay-transparency/values-prod.yaml b/charts/fin-pay-transparency/values-prod.yaml index 599bc139c..629a743ee 100644 --- a/charts/fin-pay-transparency/values-prod.yaml +++ b/charts/fin-pay-transparency/values-prod.yaml @@ -77,19 +77,13 @@ backend: port: 80 targetPort: 3000 resources: - limits: - cpu: 200m - memory: 600Mi requests: - cpu: 30m - memory: 500Mi + cpu: 150m + memory: 600Mi initResources: - limits: - cpu: 200m - memory: 250Mi requests: - cpu: 30m - memory: 100Mi + cpu: 150m + memory: 200Mi autoscaling: enabled: true @@ -134,12 +128,9 @@ frontend: port: 80 targetPort: 3000 resources: - limits: - cpu: 50m - memory: 150Mi requests: - cpu: 15m - memory: 50Mi + cpu: 50m + memory: 120Mi env: logLevel: info snowplowUrl: spt.apps.gov.bc.ca @@ -194,17 +185,11 @@ crunchy: storage: 600Mi storageClassName: netapp-block-standard requests: - cpu: 50m - memory: 128Mi - limits: - cpu: 200m - memory: 256Mi + cpu: 100m + memory: 300Mi replicaCertCopy: requests: cpu: 5m - memory: 16Mi - limits: - cpu: 20m memory: 32Mi pgBackRest: @@ -237,29 +222,17 @@ crunchy: requests: cpu: 5m memory: 32Mi - limits: - cpu: 20m - memory: 64Mi repoHost: requests: cpu: 50m - memory: 128Mi - limits: - cpu: 200m memory: 256Mi sidecars: requests: - cpu: 5m - memory: 16Mi - limits: - cpu: 20m - memory: 64Mi + cpu: 10m + memory: 32Mi jobs: requests: - cpu: 50m - memory: 128Mi - limits: - cpu: 200m + cpu: 100m memory: 256Mi patroni: postgresql: @@ -278,9 +251,6 @@ crunchy: replicas: 1 requests: cpu: 5m - memory: 16Mi - limits: - cpu: 20m memory: 32Mi # Postgres Cluster resource values: @@ -289,10 +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: 5m - memory: 16Mi - limits: - cpu: 35m + cpu: 25m memory: 32Mi doc-gen-service: enabled: true @@ -312,12 +279,9 @@ doc-gen-service: port: 80 targetPort: 3000 resources: - limits: - cpu: 650m - memory: 350Mi requests: - cpu: 100m - memory: 50Mi + cpu: 500m + memory: 400Mi podSecurityContext: {} securityContext: {} @@ -343,12 +307,9 @@ backend-external: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 20m memory: 150Mi - requests: - cpu: 10m - memory: 50Mi app: env: logLevel: info diff --git a/charts/fin-pay-transparency/values-test.yaml b/charts/fin-pay-transparency/values-test.yaml index 7faf3fc0c..020755133 100644 --- a/charts/fin-pay-transparency/values-test.yaml +++ b/charts/fin-pay-transparency/values-test.yaml @@ -60,7 +60,7 @@ global: crunchyEnabled: true backend: enabled: true - deploymentStrategy: RollingUpdate + deploymentStrategy: Recreate replicaCount: 1 nameOverride: "" fullnameOverride: "" @@ -77,23 +77,17 @@ backend: port: 80 targetPort: 3000 resources: - limits: - cpu: 150m - memory: 300Mi requests: - cpu: 50m - memory: 150Mi - initResources: - limits: cpu: 150m - memory: 250Mi + memory: 500Mi + initResources: requests: - cpu: 50m - memory: 100Mi + cpu: 150m + memory: 300Mi autoscaling: enabled: true - minReplicas: 3 + minReplicas: 2 maxReplicas: 5 targetCPUUtilizationPercentage: 60 # this percentage from request cpu storage: @@ -113,7 +107,7 @@ backend: pdb: true frontend: enabled: true - deploymentStrategy: RollingUpdate + deploymentStrategy: Recreate replicaCount: 1 nameOverride: "" fullnameOverride: "" @@ -133,17 +127,14 @@ frontend: port: 80 targetPort: 3000 resources: - limits: - cpu: 50m - memory: 150Mi requests: - cpu: 15m - memory: 50Mi + cpu: 30m + memory: 120Mi env: logLevel: info autoscaling: enabled: true - minReplicas: 3 + minReplicas: 2 maxReplicas: 5 targetCPUUtilizationPercentage: 80 # this percentage from request cpu podSecurityContext: {} @@ -181,22 +172,16 @@ crunchy: annotations: prometheus.io/scrape: "true" prometheus.io/port: "9187" - replicas: 3 + replicas: 2 dataVolumeClaimSpec: storage: 4000Mi storageClassName: netapp-block-standard requests: - cpu: 50m - memory: 128Mi - limits: - cpu: 200m + cpu: 100m memory: 256Mi replicaCertCopy: requests: - cpu: 5m - memory: 16Mi - limits: - cpu: 20m + cpu: 15m memory: 32Mi pgBackRest: @@ -229,29 +214,17 @@ crunchy: requests: cpu: 5m memory: 32Mi - limits: - cpu: 20m - memory: 64Mi repoHost: requests: - cpu: 5m - memory: 32Mi - limits: - cpu: 20m + cpu: 15m memory: 64Mi sidecars: requests: cpu: 5m - memory: 16Mi - limits: - cpu: 20m - memory: 64Mi + memory: 32Mi jobs: requests: - cpu: 5m - memory: 16Mi - limits: - cpu: 20m + cpu: 50m memory: 64Mi patroni: postgresql: @@ -271,9 +244,6 @@ crunchy: requests: cpu: 5m memory: 16Mi - limits: - cpu: 20m - memory: 32Mi # Postgres Cluster resource values: pgmonitor: @@ -281,11 +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: 5m - memory: 16Mi - limits: - cpu: 35m - memory: 32Mi + cpu: 25m + memory: 50Mi doc-gen-service: enabled: true deploymentStrategy: Recreate @@ -304,12 +271,9 @@ doc-gen-service: port: 80 targetPort: 3000 resources: - limits: - cpu: 600m - memory: 350Mi requests: - cpu: 100m - memory: 50Mi + cpu: 300m + memory: 500Mi podSecurityContext: {} securityContext: {} @@ -335,12 +299,9 @@ backend-external: port: 80 targetPort: 3000 resources: - limits: + requests: cpu: 20m memory: 150Mi - requests: - cpu: 10m - memory: 50Mi app: env: logLevel: info diff --git a/charts/fin-pay-transparency/values.yaml b/charts/fin-pay-transparency/values.yaml index 45ffae5b5..4ebf31b7e 100644 --- a/charts/fin-pay-transparency/values.yaml +++ b/charts/fin-pay-transparency/values.yaml @@ -192,12 +192,9 @@ admin-frontend: port: 80 targetPort: 3000 resources: - limits: - cpu: 50m - memory: 150Mi requests: - cpu: 15m - memory: 50Mi + cpu: 30m + memory: 100Mi env: logLevel: info isAdminDashboardAvailable: true