Skip to content

Commit

Permalink
Merge pull request #1479 from bcgov/helm/remove-default-limits
Browse files Browse the repository at this point in the history
Helm: remove default resource limits, update chart dependencies
  • Loading branch information
esune authored Jan 29, 2025
2 parents bcbdf56 + a309066 commit 8d22127
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 26 deletions.
6 changes: 3 additions & 3 deletions charts/traction/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dependencies:
version: 11.9.13
- name: common
repository: https://charts.bitnami.com/bitnami
version: 2.9.0
digest: sha256:cbec2e5934c136e5ab6ad4e9e5f9c843fab8eb9be72e0a2751420c5a8055eaac
generated: "2023-08-23T11:59:25.768695413-07:00"
version: 2.27.0
digest: sha256:29f6c4a3b351791968e3ce04f8874be2234719f4c4c8dc4bcfede343b4c86813
generated: "2025-01-23T11:25:59.1749248-08:00"
Binary file added charts/traction/charts/common-2.27.0.tgz
Binary file not shown.
Binary file removed charts/traction/charts/common-2.9.0.tgz
Binary file not shown.
28 changes: 10 additions & 18 deletions charts/traction/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ acapy:
## @param acapy.walletStorageCredentials.secretKeys.userPasswordKey Key in existing secret containing account password.
##
walletStorageCredentials:
json: ''
json: ""
account: acapy
admin_account: postgres
existingSecret: ""
Expand All @@ -186,14 +186,14 @@ acapy:
userPasswordKey: password
## @section ACA-Py Multitenancy Configuration
## Specifies the multitenancy config.
## Possible values: wallet_type, wallet_name, wallet_key, cache_size, 'key_derivation_method.
## Possible values: wallet_type, wallet_name, wallet_key, cache_size, 'key_derivation_method.
## "wallet_name" is only used when "wallet_type" is "askar-profile"
##
## @param acapy.multitenancyConfiguration.json Raw json with config. Overrides all other values including subchart values. e.g.: '{"wallet_type":"single-wallet-askar", "wallet_name":"askar-wallet"}'
## @param acapy.multitenancyConfiguration.wallet_type Database account name.
##
##
multitenancyConfiguration:
json: ''
json: ""
wallet_type: single-wallet-askar
## @section Acapy Plugins
##
Expand Down Expand Up @@ -289,9 +289,7 @@ acapy:
## @param acapy.resources.requests.cpu The requested cpu for the Acapy containers
##
resources:
limits:
cpu: 300m
memory: 300Mi
limits: {}
requests:
cpu: 120m
memory: 200Mi
Expand Down Expand Up @@ -553,9 +551,7 @@ tenant_proxy:
## @param tenant_proxy.resources.requests.cpu The requested cpu for the Tenant proxy containers
##
resources:
limits:
cpu: 100m
memory: 50Mi
limits: {}
requests:
cpu: 10m
memory: 50Mi
Expand Down Expand Up @@ -601,7 +597,7 @@ ui:
## @param ui.oidc.quickConnectEndorserName A ledger that has endorser auto-accept/transact enabled
quickConnectEndorserName: ""
## @param ui.requireEmailForReservation Whether the Email field is needed for a tenant reservation
## If false will default [email protected] to API
## If false will default [email protected] to API
requireEmailForReservation: true
## @param ui.lokiUrl The endpoint to stream loki logs from for the Tenant UI
lokiUrl: ""
Expand Down Expand Up @@ -687,7 +683,7 @@ ui:
reservationForm: >-
{}
## @param ui.oidc.extraQueryParams
extraQueryParams: '{}'
extraQueryParams: "{}"

## SMTP Configuration
smtp:
Expand Down Expand Up @@ -768,9 +764,7 @@ ui:
## @param ui.resources.requests.cpu The requested cpu for the tenant-ui containers
##
resources:
limits:
cpu: 300m
memory: 128Mi
limits: {}
requests:
cpu: 10m
memory: 80Mi
Expand Down Expand Up @@ -911,9 +905,7 @@ postgresql:
## @param postgresql.primary.resources.requests.cpu The requested cpu for the PostgreSQL Primary containers
##
resources:
limits:
cpu: 500m
memory: 500Mi
limits: {}
requests:
cpu: 100m
memory: 100Mi
Expand Down
3 changes: 0 additions & 3 deletions deploy/traction/values-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ acapy:
auto_issuer: true
resources:
limits:
cpu: 200m
memory: 300Mi
requests:
cpu: 120m
Expand Down Expand Up @@ -133,7 +132,6 @@ ui:
innkeeperInbox: lucas.o'[email protected]
resources:
limits:
cpu: 300m
memory: 128Mi
requests:
cpu: 10m
Expand All @@ -154,7 +152,6 @@ postgresql:
primary:
resources:
limits:
cpu: 200m
memory: 128Mi
requests:
cpu: 100m
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ services:
- host.docker.internal:host-gateway

traction-db:
image: "postgres:14.5"
image: "postgres:15"
environment:
- POSTGRES_USER=${POSTGRESQL_USER}
- POSTGRES_PASSWORD=${POSTGRESQL_PASSWORD}
Expand Down Expand Up @@ -240,7 +240,7 @@ services:
- host.docker.internal:host-gateway

endorser-db:
image: "postgres:14.5"
image: "postgres:15"
environment:
- POSTGRES_USER=${POSTGRESQL_USER}
- POSTGRES_PASSWORD=${POSTGRESQL_PASSWORD}
Expand Down

0 comments on commit 8d22127

Please sign in to comment.