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

feat(registry-scanner): add worker job cpu limits #2169

Merged
merged 4 commits into from
Mar 25, 2025
Merged

feat(registry-scanner): add worker job cpu limits #2169

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4005c9
add worker job cpu limits
maratsal Mar 3, 2025
6d3e61d
Merge branch 'main' into feat-add-cpu-limit-registry-scanner-job
hayk99 Mar 17, 2025
78a9a97
deps: bump chart and app version
hayk99 Mar 25, 2025
e147fd6
Merge branch 'main' into feat-add-cpu-limit-registry-scanner-job
hayk99 Mar 25, 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
2 changes: 1 addition & 1 deletion charts/registry-scanner/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Sysdig Registry Scanner
type: application
home: https://www.sysdig.com/
icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4
version: 1.6.10
version: 1.6.11
appVersion: 0.7.5
maintainers:
- name: sysdiglabs
3 changes: 2 additions & 1 deletion charts/registry-scanner/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ The following table lists the configurable parameters of the Sysdig Registry Sca
| config.scan.jobs.resources.requests.memory | The memory request for the scanner job. | <code>500Mi</code> |
| config.scan.jobs.resources.requests.cpu | The CPU request for the scanner job. | <code>500m</code> |
| config.scan.jobs.resources.limits.memory | The memory limit for the scanner job. | <code>2Gi</code> |
| config.scan.jobs.resources.limits.cpu | The CPU limit for the scanner job. | <code>1</code> |
| config.scan.jobs.temporaryVolumeSizeLimit | The size limit for the emptyDir volume used by the scanner job.<br/> This volume is used to store both the vulnerability database and the image to scan. | <code>2Gi</code> |
| config.scan.jobs.nodeSelector | NodeSelector for child jobs. If only .Values.nodeSelector is specified, child jobs will inherit the same nodeSelector as the main pod | <code>{}</code> |
| config.scan.disablePlatformScanning | Force the scan to happen on the client component rather than relying on backend scanning | <code>false</code> |
Expand Down Expand Up @@ -136,7 +137,7 @@ Use the following command to deploy:
helm upgrade --install registry-scanner \
--namespace sysdig-agent \
--create-namespace \
--version=1.6.10 \
--version=1.6.11 \
--set config.secureBaseURL=<SYSDIG_SECURE_URL> \
--set config.secureAPIToken=<SYSDIG_SECURE_API_TOKEN> \
--set config.secureSkipTLS=true \
Expand Down
1 change: 1 addition & 0 deletions charts/registry-scanner/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ data:
cpu: {{ .Values.config.scan.jobs.resources.requests.cpu }}
limits:
memory: {{ .Values.config.scan.jobs.resources.limits.memory }}
cpu: {{ .Values.config.scan.jobs.resources.limits.cpu }}
temporaryVolumeSizeLimit: {{ .Values.config.scan.jobs.temporaryVolumeSizeLimit }}
{{- if or .Values.config.scan.inlineScanImage .Values.image.fips }}
inlineScanImage: {{ include "registry-scanner.inlineScanImage" . }}
Expand Down
7 changes: 4 additions & 3 deletions charts/registry-scanner/tests/configmap_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,20 @@ tests:
asserts:
- matchRegex:
path: data['config.yaml']
pattern: requests:\n\s*memory:\s*500Mi\n\s*cpu:\s*500m\n\s*limits:\s*memory:\s*2Gi
pattern: requests:\n\s*memory:\s*500Mi\n\s*cpu:\s*500m\n\s*limits:\s*memory:\s*2Gi\n\s*cpu:\s*1
- it: resource request and limit wires if custom setup is given
set:
config.scan.jobs.resources:
requests:
memory: 1Mi
cpu: 1m
limits:
memory: 2Mi
memory: 2Mi
cpu: 2m
asserts:
- matchRegex:
path: data['config.yaml']
pattern: requests:\n\s*memory:\s*1Mi\n\s*cpu:\s*1m\n\s*limits:\s*memory:\s*2Mi
pattern: requests:\n\s*memory:\s*1Mi\n\s*cpu:\s*1m\n\s*limits:\s*memory:\s*2Mi\n\s*cpu:\s*2m
- it: sets the temporaryVolumeSizeLimit on job
set:
config:
Expand Down
2 changes: 2 additions & 0 deletions charts/registry-scanner/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ config:
limits:
# The memory limit for the scanner job.
memory: 2Gi
# The CPU limit for the scanner job.
cpu: 1
# The size limit for the emptyDir volume used by the scanner job.<br/>
# This volume is used to store both the vulnerability database and the image to scan.
temporaryVolumeSizeLimit: 2Gi
Expand Down
Loading