diff --git a/helm/app/templates/cronJobs/prepare-download.yaml b/helm/app/templates/cronJobs/prepare-download.yaml index 3fa07d23eb..5feedcf08a 100644 --- a/helm/app/templates/cronJobs/prepare-download.yaml +++ b/helm/app/templates/cronJobs/prepare-download.yaml @@ -23,9 +23,6 @@ spec: image: docker.io/alpine/curl imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: 200m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/app/templates/cronJobs/receive-applications.yaml b/helm/app/templates/cronJobs/receive-applications.yaml index 28363fb73e..95ea926dc3 100644 --- a/helm/app/templates/cronJobs/receive-applications.yaml +++ b/helm/app/templates/cronJobs/receive-applications.yaml @@ -23,9 +23,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: 200m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/app/templates/cronJobs/trigger-community-report-notification.yaml b/helm/app/templates/cronJobs/trigger-community-report-notification.yaml index 5b50cf6012..12ecd765c9 100644 --- a/helm/app/templates/cronJobs/trigger-community-report-notification.yaml +++ b/helm/app/templates/cronJobs/trigger-community-report-notification.yaml @@ -41,9 +41,6 @@ spec: image: {{ .Values.image.cronsp.repository }}:{{ .Values.image.cronsp.tag }} imagePullPolicy: IfNotPresent resources: - limits: - cpu: 200m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/app/templates/cronJobs/trigger-milestone-notification.yaml b/helm/app/templates/cronJobs/trigger-milestone-notification.yaml index 5cc3590361..24ebcbe8fc 100644 --- a/helm/app/templates/cronJobs/trigger-milestone-notification.yaml +++ b/helm/app/templates/cronJobs/trigger-milestone-notification.yaml @@ -41,9 +41,6 @@ spec: image: {{ .Values.image.cronsp.repository }}:{{ .Values.image.cronsp.tag }} imagePullPolicy: IfNotPresent resources: - limits: - cpu: 200m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/app/templates/cronJobs/trigger-shp-import.yaml b/helm/app/templates/cronJobs/trigger-shp-import.yaml index fa38d92f34..aedd353689 100644 --- a/helm/app/templates/cronJobs/trigger-shp-import.yaml +++ b/helm/app/templates/cronJobs/trigger-shp-import.yaml @@ -73,9 +73,6 @@ spec: image: {{ .Values.image.cronshp.repository }}:{{ .Values.image.cronshp.tag }} imagePullPolicy: IfNotPresent resources: - limits: - cpu: 200m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/app/templates/cronJobs/trigger-sp-import.yaml b/helm/app/templates/cronJobs/trigger-sp-import.yaml index 150508253e..4b63f20b1d 100644 --- a/helm/app/templates/cronJobs/trigger-sp-import.yaml +++ b/helm/app/templates/cronJobs/trigger-sp-import.yaml @@ -41,9 +41,6 @@ spec: image: {{ .Values.image.cronsp.repository }}:{{ .Values.image.cronsp.tag }} imagePullPolicy: IfNotPresent resources: - limits: - cpu: 200m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/app/templates/db-pre-upgrade-job.yaml b/helm/app/templates/db-pre-upgrade-job.yaml index 65ced24396..70c454b0fb 100644 --- a/helm/app/templates/db-pre-upgrade-job.yaml +++ b/helm/app/templates/db-pre-upgrade-job.yaml @@ -21,9 +21,6 @@ spec: image: {{ .Values.image.psql.repository }}:{{ default .Values.defaultImageTag .Values.image.psql.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: 1000m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/app/templates/deployment.yaml b/helm/app/templates/deployment.yaml index b61e3fc8fc..86ab2be90c 100644 --- a/helm/app/templates/deployment.yaml +++ b/helm/app/templates/deployment.yaml @@ -69,9 +69,6 @@ spec: name: {{ template "ccbc.fullname" . }}-provision-pg-credentials image: {{ .Values.image.psql.repository }}:{{ .Values.image.psql.tag }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -118,9 +115,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -144,9 +138,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -254,9 +245,6 @@ spec: requests: memory: {{ .Values.resources.app.requests.memory }} cpu: {{ .Values.resources.app.requests.cpu }} - limits: - memory: {{ .Values.resources.app.limits.memory }} - cpu: {{ .Values.resources.app.limits.cpu }} ports: - containerPort: {{ .Values.app.port }} protocol: TCP diff --git a/helm/app/values-prod.yaml b/helm/app/values-prod.yaml index 3807d97efb..6ebf6a7677 100644 --- a/helm/app/values-prod.yaml +++ b/helm/app/values-prod.yaml @@ -7,18 +7,12 @@ resources: requests: cpu: 20m memory: '512Mi' - limits: - cpu: 300m - memory: '1Gi' proxy: pgBouncer: requests: cpu: 10m memory: 16Mi - limits: - cpu: 250m - memory: 32Mi instances: requests: diff --git a/helm/app/values.yaml b/helm/app/values.yaml index df2c9f53e2..fce7c2e4e4 100644 --- a/helm/app/values.yaml +++ b/helm/app/values.yaml @@ -71,16 +71,10 @@ resources: requests: cpu: 10m memory: '512Mi' - limits: - cpu: 200m - memory: '1Gi' psql: requests: cpu: 10m memory: '128Mi' - limits: - cpu: 100m - memory: '256Mi' autoscaling: enabled: true @@ -171,16 +165,10 @@ crunchy-postgres: requests: cpu: 1m memory: 512Mi - limits: - cpu: 1000m - memory: 1Gi replicaCertCopy: requests: cpu: 1m memory: 32Mi - limits: - cpu: 50m - memory: 64Mi pgBackRest: retention: '30' # Ideally a larger number such as 30 backups/days # If retention-full-type set to 'count' then the oldest backups will expire when the number of backups reach the number defined in retention @@ -198,16 +186,10 @@ crunchy-postgres: requests: cpu: 2m memory: 64Mi - limits: - cpu: 50m - memory: 128Mi sidecars: requests: cpu: 1m memory: 64Mi - limits: - cpu: 50m - memory: 128Mi s3: enabled: true createS3Secret: false @@ -235,15 +217,9 @@ crunchy-postgres: requests: cpu: 2m memory: 8Mi - limits: - cpu: 50m - memory: 32Mi pgmonitor: enabled: true exporter: requests: cpu: 1m memory: 64Mi - limits: - cpu: 50m - memory: 128Mi diff --git a/helm/ccbc-tools/templates/ci-cd/buildconfig.yaml b/helm/ccbc-tools/templates/ci-cd/buildconfig.yaml index 1adb66b5e1..b5c5a769b1 100644 --- a/helm/ccbc-tools/templates/ci-cd/buildconfig.yaml +++ b/helm/ccbc-tools/templates/ci-cd/buildconfig.yaml @@ -8,9 +8,6 @@ spec: kind: ImageStreamTag name: 'python-3-11-with-requests:latest' resources: - limits: - cpu: 1 - memory: 2Gi requests: cpu: 500m memory: 1Gi diff --git a/helm/feature/templates/db-pre-job.yaml b/helm/feature/templates/db-pre-job.yaml index 5800c872d0..ab76df2fbc 100644 --- a/helm/feature/templates/db-pre-job.yaml +++ b/helm/feature/templates/db-pre-job.yaml @@ -21,9 +21,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: 1000m - memory: 256Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/feature/templates/deployment.yaml b/helm/feature/templates/deployment.yaml index 5853071012..f905f50483 100644 --- a/helm/feature/templates/deployment.yaml +++ b/helm/feature/templates/deployment.yaml @@ -68,9 +68,6 @@ spec: name: {{ template "ccbc.fullname" . }}-provision-pg-credentials image: {{ .Values.image.psql.repository }}:{{ .Values.image.psql.tag }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -118,9 +115,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -145,9 +139,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -255,9 +246,6 @@ spec: requests: memory: {{ .Values.resources.app.requests.memory }} cpu: {{ .Values.resources.app.requests.cpu }} - limits: - memory: {{ .Values.resources.app.limits.memory }} - cpu: {{ .Values.resources.app.limits.cpu }} ports: - containerPort: {{ .Values.app.port }} protocol: TCP diff --git a/helm/feature/values.yaml b/helm/feature/values.yaml index e35b86e85b..f5b6cd813f 100644 --- a/helm/feature/values.yaml +++ b/helm/feature/values.yaml @@ -36,16 +36,10 @@ resources: requests: cpu: 1m memory: '256Mi' - limits: - cpu: 200m - memory: '1024Mi' psql: requests: cpu: 10m memory: '128Mi' - limits: - cpu: 100m - memory: '256Mi' autoscaling: enabled: false diff --git a/helm/hotfix/templates/db-pre-upgrade-job.yaml b/helm/hotfix/templates/db-pre-upgrade-job.yaml index 65ced24396..70c454b0fb 100644 --- a/helm/hotfix/templates/db-pre-upgrade-job.yaml +++ b/helm/hotfix/templates/db-pre-upgrade-job.yaml @@ -21,9 +21,6 @@ spec: image: {{ .Values.image.psql.repository }}:{{ default .Values.defaultImageTag .Values.image.psql.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: 1000m - memory: 128Mi requests: cpu: 100m memory: 64Mi diff --git a/helm/hotfix/templates/deployment.yaml b/helm/hotfix/templates/deployment.yaml index 50f166d892..f0f8a93f4e 100644 --- a/helm/hotfix/templates/deployment.yaml +++ b/helm/hotfix/templates/deployment.yaml @@ -68,9 +68,6 @@ spec: name: {{ template "ccbc.fullname" . }}-provision-pg-credentials image: {{ .Values.image.psql.repository }}:{{ .Values.image.psql.tag }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -118,9 +115,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -145,9 +139,6 @@ spec: image: {{ .Values.image.db.repository }}:{{ .Values.image.db.tag }} imagePullPolicy: {{ .Values.image.db.pullPolicy }} resources: - limits: - cpu: {{ .Values.resources.psql.limits.cpu }} - memory: {{ .Values.resources.psql.limits.memory }} requests: cpu: {{ .Values.resources.psql.requests.cpu }} memory: {{ .Values.resources.psql.requests.memory }} @@ -213,9 +204,6 @@ spec: requests: memory: {{ .Values.resources.app.requests.memory }} cpu: {{ .Values.resources.app.requests.cpu }} - limits: - memory: {{ .Values.resources.app.limits.memory }} - cpu: {{ .Values.resources.app.limits.cpu }} ports: - containerPort: {{ .Values.app.port }} protocol: TCP diff --git a/helm/hotfix/values.yaml b/helm/hotfix/values.yaml index 0b718af259..a4b3a91d49 100644 --- a/helm/hotfix/values.yaml +++ b/helm/hotfix/values.yaml @@ -33,16 +33,10 @@ resources: requests: cpu: 1m memory: '256Mi' - limits: - cpu: 200m - memory: '512Mi' psql: requests: cpu: 10m memory: '128Mi' - limits: - cpu: 100m - memory: '256Mi' autoscaling: enabled: true