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.

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): ovveride platform scanning logic #1496

Merged
merged 5 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions charts/registry-scanner/Chart.yaml
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.1.25
appVersion: 0.2.60
version: 1.1.26
appVersion: 0.2.61
maintainers:
- name: sysdiglabs
3 changes: 2 additions & 1 deletion charts/registry-scanner/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ The following table lists the configurable parameters of the Sysdig Registry Sca
| 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.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.disablePlatformScanning | Force the scan to happen on the client component rather than relying on backend scanning | <code>false</code> |
| config.parallelGoRoutines | Number of goroutines running in parallel in metadata phase for ECR Org setup. | <code>100</code> |
| ssl.ca.certs | For outbound connections. <br/>List of PEM-encoded x509 certificate authority. | <code>[]</code> |
| customLabels | The additional labels to add to CronJob and Scanning Jobs. The custom labels to be added to kubernetes manifests of all the resources created. | <code>{}</code> |
Expand Down Expand Up @@ -129,7 +130,7 @@ Use the following command to deploy:
helm upgrade --install registry-scanner \
--namespace sysdig-agent \
--create-namespace \
--version=1.1.25 \
--version=1.1.26 \
--set config.secureBaseURL=<SYSDIG_SECURE_URL> \
--set config.secureAPIToken=<SYSDIG_SECURE_API_TOKEN> \
--set config.secureSkipTLS=true \
Expand Down
2 changes: 1 addition & 1 deletion charts/registry-scanner/README.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Use the following command to deploy:
helm upgrade --install registry-scanner \
--namespace sysdig-agent \
--create-namespace \
{{ with .Chart.Version }}--version={{.}} {{ end }} \
{{ with .Chart.Version }}--version={{.}}{{ end }} \
--set config.secureBaseURL=<SYSDIG_SECURE_URL> \
--set config.secureAPIToken=<SYSDIG_SECURE_API_TOKEN> \
--set config.secureSkipTLS=true \
Expand Down
2 changes: 2 additions & 0 deletions charts/registry-scanner/templates/_job.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@
- name: REGISTRYSCANNER_PROFILING_ENABLED
value: /profiling
{{- end }}
- name: REGISTRYSCANNER_CRONJOB_SCHEDULE
value: {{ .Values.cronjob.schedule | quote }}
{{- if .Values.extraEnvVars }}
{{- toYaml .Values.extraEnvVars | nindent 10 }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions charts/registry-scanner/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ data:
k8sInCluster: true
namespace: {{ .Release.Namespace }}
workers: {{ .Values.config.maxWorkers }}
disablePlatformScanning: {{ default false .Values.config.scan.disablePlatformScanning }}
jobs:
ttlSecondsAfterFinished: {{ .Values.config.scan.jobs.ttlSecondsAfterFinished }}
serviceAccountName: {{ include "registry-scanner.serviceAccountName" . }}
Expand Down
14 changes: 14 additions & 0 deletions charts/registry-scanner/tests/configmap_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,17 @@ tests:
- matchRegex:
path: data['config.yaml']
pattern: allowListMemberAccountIDs:\n\s*- 123456789
- it: platform scanning is not disable by default
asserts:
- matchRegex:
path: data['config.yaml']
pattern: scan:((.|\n)*)disablePlatformScanning:\s*false
- it: force scanning on the client component regardless of backend config
set:
config:
scan:
disablePlatformScanning: "true"
asserts:
- matchRegex:
path: data['config.yaml']
pattern: scan:((.|\n)*)disablePlatformScanning:\s*true
2 changes: 2 additions & 0 deletions charts/registry-scanner/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ config:
# 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
# Force the scan to happen on the client component rather than relying on backend scanning
disablePlatformScanning: false
# Number of goroutines running in parallel in metadata phase for ECR Org setup.
parallelGoRoutines: 100
ssl:
Expand Down
Loading