Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ndt 700 remove limits from all our resources #3792

Merged
merged 5 commits into from
Jan 24, 2025
Merged

Ndt 700 remove limits from all our resources #3792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b127c4
chore: remove helm limits
rafasdc Jan 16, 2025
647ee0f
chore: temp deploy
rafasdc Jan 16, 2025
2502925
chore: revert
rafasdc Jan 24, 2025
2ae8bd1
chore: revert
rafasdc Jan 24, 2025
5e09d6d
Merge branch 'main' into NDT-700-Remove-limits-from-all-our-resources
rafasdc Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions helm/app/templates/cronJobs/prepare-download.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions helm/app/templates/cronJobs/receive-applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions helm/app/templates/cronJobs/trigger-community-report-notification.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions helm/app/templates/cronJobs/trigger-milestone-notification.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions helm/app/templates/cronJobs/trigger-shp-import.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions helm/app/templates/cronJobs/trigger-sp-import.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions helm/app/templates/db-pre-upgrade-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions helm/app/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions helm/app/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
24 changes: 0 additions & 24 deletions helm/app/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
3 changes: 0 additions & 3 deletions helm/ccbc-tools/templates/ci-cd/buildconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions helm/feature/templates/db-pre-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions helm/feature/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions helm/feature/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions helm/hotfix/templates/db-pre-upgrade-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions helm/hotfix/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions helm/hotfix/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading