Merge branch 'master' into add-gar-support

sysdiglabs · Oct 18, 2023 · 1a1f990 · 1a1f990
2 parents 58f6ef0 + 99760eb
commit 1a1f990
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/charts/registry-scanner/CHANGELOG.md b/charts/registry-scanner/CHANGELOG.md
@@ -10,6 +10,7 @@ Manual edits are supported only below '## Change Log' and should be used
 exclusively to fix incorrect entries and not to add new ones.
 
 ## Change Log
+# v1.1.10
 # v1.1.9
 ### Chores
 * **registry-scanner** [b9f6b22f](https://github.com/sysdiglabs/charts/commit/b9f6b22fa7743d5f8ef9537c3e408f65a407dd07): Update to v0.2.48 ([#1374](https://github.com/sysdiglabs/charts/issues/1374))

diff --git a/charts/registry-scanner/Chart.yaml b/charts/registry-scanner/Chart.yaml
@@ -5,7 +5,7 @@ type: application
 home: https://sysdiglabs.github.io/registry-scanner/
 icon: https://478h5m1yrfsa3bbe262u7muv-wpengine.netdna-ssl.com/wp-content/uploads/2019/02/Shovel_600px.png
 version: 1.1.10
-appVersion: 0.2.48
+appVersion: 0.2.50
 maintainers:
   - name: giuse-sysdig
     email: [email protected]

diff --git a/charts/registry-scanner/README.md b/charts/registry-scanner/README.md
@@ -92,6 +92,7 @@ The following table lists the configurable parameters of the Sysdig Registry Sca
 | 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.useMainDbV2                               | Enable vulnerability MainDB V2                                                                                                                                                                                                             | <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>                              |
 | proxy.httpProxy                                  | The URL of the proxy for HTTP connections. Leave it empty if not using proxy, which sets the `http_proxy` environment variable.                                                                                                            | <code></code>                                |

diff --git a/charts/registry-scanner/RELEASE-NOTES.md b/charts/registry-scanner/RELEASE-NOTES.md
@@ -1,5 +1,3 @@
 # What's Changed
 
-### Chores
-- **registry-scanner** [b9f6b22f](https://github.com/sysdiglabs/charts/commit/b9f6b22fa7743d5f8ef9537c3e408f65a407dd07): Update to v0.2.48 ([#1374](https://github.com/sysdiglabs/charts/issues/1374))
-#### Full diff: https://github.com/sysdiglabs/charts/compare/registry-scanner-1.1.8...registry-scanner-1.1.9
+#### Full diff: https://github.com/sysdiglabs/charts/compare/registry-scanner-1.1.9...registry-scanner-1.1.10
diff --git a/charts/registry-scanner/ci/test-aws-org-values.yaml.template.disabled b/charts/registry-scanner/ci/test-aws-org-values.yaml.template.disabled
@@ -0,0 +1,13 @@
+config:
+  secureAPIToken: ${SECURE_API_TOKEN}
+  registryType: artifactory
+  registryURL: ${SYSDIG_JFROG_SAAS_QA_URL}
+  registryApiUrl: ${SYSDIG_JFROG_SAAS_QA_API_URL}
+  registryUser: ${SYSDIG_JFROG_SAAS_QA_USER}
+  registryPassword: ${SYSDIG_JFROG_SAAS_QA_TOKEN}
+  filter:
+    include: 'alpine:3.1'
+    exclude: '.*'
+scanOnStart:
+  enabled: true
+  asPostInstallHook: true
diff --git a/charts/registry-scanner/templates/_job.tpl b/charts/registry-scanner/templates/_job.tpl
@@ -116,6 +116,10 @@
                 {{- end }}
                 key: registryPassword
           {{- end }}
+          {{ if .Values.config.parallelGoRoutines }}
+          - name: GROUP_LIMIT
+            value: "{{ .Values.config.parallelGoRoutines }}"
+          {{- end }}
           {{- if .Values.extraEnvVars }}
           {{- toYaml .Values.extraEnvVars | nindent 10 }}
           {{- end }}

diff --git a/charts/registry-scanner/values.yaml b/charts/registry-scanner/values.yaml
@@ -105,6 +105,8 @@ config:
       temporaryVolumeSizeLimit: 2Gi
   # Enable vulnerability MainDB V2
   useMainDbV2: false
+  # Number of goroutines running in parallel in metadata phase for ECR Org setup.
+  parallelGoRoutines: 100
 ssl:
   ca:
     # For outbound connections.