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

fix: default resource config #1726

Merged
merged 4 commits into from
Sep 24, 2024
Merged

fix: default resource config #1726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ff75e7
fix: default resource config
srodenhuis Sep 23, 2024
331ca8a
fix: values schema and defaults
srodenhuis Sep 24, 2024
2ce538b
Merge branch 'main' into sr-fix-resources
srodenhuis Sep 24, 2024
653aa96
fix: values changes version
srodenhuis Sep 24, 2024
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
206 changes: 172 additions & 34 deletions helmfile.d/snippets/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,10 @@ environments:
memory: 1Gi
falcoCtlFollow:
requests:
cpu: 20m
cpu: 100m
memory: 16Mi
limits:
cpu: 50m
cpu: 500m
memory: 32Mi
falcoCtlInstall:
requests:
Expand All @@ -264,23 +264,67 @@ environments:
memory: 256Mi
falcoExporter:
requests:
cpu: 20m
cpu: 100m
memory: 16Mi
limits:
cpu: 50m
cpu: 500m
memory: 32Mi
gitea:
adminUsername: otomi-admin
_rawValues: {}
resources:
gitea:
limits:
cpu: 1
srodenhuis marked this conversation as resolved.
Show resolved Hide resolved
memory: 1Gi
requests:
cpu: 100m
memory: 128Mi
memcached:
limits:
cpu: 250m
memory: 256Mi
requests:
cpu: 100m
memory: 128Mi
memcachedMetrics:
limits:
cpu: 200m
memory: 128M
requests:
cpu: 50m
memory: 64M
init:
limits:
cpu: 400m
memory: 256Mi
requests:
cpu: 100m
memory: 128Mi
grafana:
enabled: false
resources:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 500m
memory: 256Mi
grafana:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 500m
memory: 256Mi
downloadDashboards:
limits:
cpu: 500m
memory: 100Mi
requests:
cpu: 200m
memory: 50Mi
sidecar:
limits:
cpu: 500m
memory: 100Mi
requests:
cpu: 200m
memory: 50Mi
_rawValues: {}
harbor:
enabled: false
Expand Down Expand Up @@ -332,7 +376,7 @@ environments:
limits:
cpu: 500m
memory: 256Mi
registry-controller:
registryController:
requests:
cpu: 100m
memory: 256Mi
Expand Down Expand Up @@ -365,12 +409,27 @@ environments:
maxBodySize: 1024m
maxBodySizeBytes: 1073741824
resources:
requests:
cpu: 200m
memory: 512Mi
limits:
cpu: "2"
memory: 2Gi
controller:
requests:
cpu: 200m
memory: 512Mi
limits:
cpu: "2"
memory: 2Gi
opentelemetry:
requests:
cpu: 100m
memory: 65Mi
limits:
cpu: 500m
memory: 256Mi
defaultBackend:
limits:
cpu: 20m
memory: 20Mi
requests:
cpu: 10m
memory: 10Mi
_rawValues: {}
istio:
tracing:
Expand Down Expand Up @@ -422,6 +481,42 @@ environments:
_rawValues: {}
jaeger:
enabled: false
resources:
operator:
limits:
cpu: 500m
memory: 128Mi
requests:
cpu: 100m
memory: 32Mi
agent:
limits:
cpu: 100m
memory: 128Mi
requests:
cpu: 10m
memory: 32Mi
collector:
limits:
cpu: 100m
memory: 128Mi
requests:
cpu: 10m
memory: 32Mi
ingester:
limits:
cpu: 100m
memory: 128Mi
requests:
cpu: 10m
memory: 32Mi
jaeger:
limits:
cpu: "1"
memory: 512Mi
requests:
cpu: 100m
memory: 128Mi
_rawValues: {}
keycloak:
adminUsername: otomi-admin
Expand Down Expand Up @@ -567,6 +662,13 @@ environments:
limits:
cpu: 200m
memory: 256Mi
reverseProxy:
limits:
cpu: 100m
memory: 32Mi
requests:
cpu: 50m
memory: 16Mi
persistence:
ingester:
size: 20Gi
Expand Down Expand Up @@ -630,8 +732,30 @@ environments:
otomi-api:
editorInactivityTimeout: 1
_rawValues: {}
resources:
api:
limits:
cpu: 500m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
tools:
limits:
cpu: 600m
memory: 512Mi
requests:
cpu: 100m
memory: 128Mi
otomi-console:
_rawValues: {}
resources:
srodenhuis marked this conversation as resolved.
Show resolved Hide resolved
limits:
cpu: 400m
memory: 256Mi
requests:
cpu: 50m
memory: 128Mi
otomi-operator:
resources:
operator:
Expand All @@ -646,34 +770,41 @@ environments:
resources:
operator:
requests:
cpu: 100m
cpu: 200m
memory: 128Mi
limits:
cpu: 200m
memory: 256Mi
cpu: "1"
memory: 512Mi
_rawValues: {}
apl-gitea-operator:
resources:
operator:
requests:
cpu: 100m
cpu: 200m
memory: 128Mi
limits:
cpu: 200m
cpu: "1"
memory: 512Mi
_rawValues: {}
apl-keycloak-operator:
resources:
operator:
requests:
cpu: 100m
cpu: 200m
memory: 128Mi
limits:
cpu: 200m
memory: 256Mi
cpu: "1"
memory: 512Mi
_rawValues: {}
promtail:
enabled: false
resources:
requests:
cpu: 200m
memory: 256Mi
limits:
cpu: "1"
memory: 512Mi
_rawValues: {}
prometheus-blackbox-exporter:
_rawValues: {}
Expand All @@ -691,6 +822,13 @@ environments:
retentionSize: 4GB
storageSize: 5Gi
resources:
prometheusOperator:
limits:
cpu: 400m
memory: 256Mi
requests:
cpu: 100m
memory: 128Mi
prometheus:
requests:
cpu: 100m
Expand Down Expand Up @@ -901,21 +1039,21 @@ environments:
replicas: 2
resources:
limits:
cpu: 500m
memory: 512Mi
cpu: "1"
memory: 1Gi
requests:
cpu: 50m
cpu: 200m
memory: 256Mi
harbor:
size: 5Gi
replicas: 2
coreDatabase: registry
resources:
limits:
cpu: 500m
memory: 512Mi
cpu: "1"
memory: 1Gi
requests:
cpu: 50m
cpu: 200m
memory: 256Mi
gitea:
useOtomiDB: true
Expand All @@ -924,10 +1062,10 @@ environments:
replicas: 2
resources:
limits:
cpu: 500m
memory: 512Mi
cpu: "1"
memory: 1Gi
requests:
cpu: 50m
cpu: 200m
memory: 256Mi
obj:
provider:
Expand Down
13 changes: 7 additions & 6 deletions tests/fixtures/env/apps/ingress-nginx-net-a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ apps:
modsecurity:
enabled: true
resources:
limits:
cpu: 200m
memory: 256Mi
requests:
cpu: 100m
memory: 192Mi
controller:
limits:
cpu: 200m
memory: 256Mi
requests:
cpu: 100m
memory: 192Mi
13 changes: 7 additions & 6 deletions tests/fixtures/env/apps/ingress-nginx-platform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ apps:
modsecurity:
enabled: true
resources:
limits:
cpu: 200m
memory: 256Mi
requests:
cpu: 100m
memory: 192Mi
controller:
limits:
cpu: 200m
memory: 256Mi
requests:
cpu: 100m
memory: 192Mi
13 changes: 7 additions & 6 deletions tests/fixtures/env/apps/ingress-nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ apps:
modsecurity:
enabled: true
resources:
limits:
cpu: 200m
memory: 256Mi
requests:
cpu: 100m
memory: 192Mi
controller:
limits:
cpu: 200m
memory: 256Mi
requests:
cpu: 100m
memory: 192Mi
4 changes: 4 additions & 0 deletions values-changes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,7 @@ changes:
- 'otomi.isHomeMonitored'
- 'home'
- 'dns.provider.civo'
- version: 27
merll marked this conversation as resolved.
Show resolved Hide resolved
relocations:
- 'apps.harbor.resources.registry-controller': 'apps.harbor.resources.registryController'
- 'apps.ingress-nginx.resources': 'apps.ingress-nginx.resources.controller'
Loading