Skip to content

Commit

Permalink
fix: honor ephemeralStorage,if set (#1259)
Browse files Browse the repository at this point in the history
  • Loading branch information
1337andre authored Jun 5, 2023
1 parent 3e528c2 commit e2362fa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions deploy/helm/templates/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ data:
{{- if hasKey . "memory" }}
trivy.resources.requests.memory: {{ .memory | quote }}
{{- end }}
{{- if hasKey . "ephemeral-storage" }}
trivy.resources.requests.ephemeral-storage: {{ .memory | quote }}
{{- if hasKey . "ephemeralStorage" }}
trivy.resources.requests.ephemeral-storage: {{ .ephemeralStorage | quote }}
{{- end }}
{{- end }}
{{- with .limits }}
Expand All @@ -186,8 +186,8 @@ data:
{{- if .memory }}
trivy.resources.limits.memory: {{ .memory | quote }}
{{- end }}
{{- if hasKey . "ephemeral-storage" }}
trivy.resources.limits.ephemeral-storage: {{ .memory | quote }}
{{- if hasKey . "ephemeralStorage" }}
trivy.resources.limits.ephemeral-storage: {{ .ephemeralStorage | quote }}
{{- end }}
{{- end }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,11 @@ trivy:
requests:
cpu: 100m
memory: 100M
# ephemeral-storage: "2Gi"
# ephemeralStorage: "2Gi"
limits:
cpu: 500m
memory: 500M
# ephemeral-storage: "2Gi"
# ephemeralStorage: "2Gi"

# githubToken is the GitHub access token used by Trivy to download the vulnerabilities
# database from GitHub. Only applicable in Standalone mode.
Expand Down

0 comments on commit e2362fa

Please sign in to comment.