Skip to content

Commit ca1e2ab

Browse files
committed
docs: clarify potential flag collision
More specifically, accessGlobalSecretsAndServiceAccount may not be true for privateRegistryScanSecretsNames to be considered.
1 parent 50487e6 commit ca1e2ab

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

deploy/helm/values.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ operator:
115115
configAuditScannerScanOnlyCurrentRevisions: true
116116
# -- batchDeleteDelay the duration to wait before deleting another batch of config audit reports.
117117
batchDeleteDelay: 10s
118-
# -- accessGlobalSecretsAndServiceAccount The flag to enable access to global secrets/service accounts to allow `vulnerability scan job` to pull images from private registries
118+
# -- accessGlobalSecretsAndServiceAccount The flag to enable access to global secrets/service accounts so that
119+
# `vulnerability scan jobs` may derive and access imagePullSecrets from the pod's or serviceaccount's spec.
120+
# The setting is mutually exclusive with privateRegistryScanSecretsNames, when true, secrets from privateRegistryScanSecretsNames
121+
# are not considered when pulling images to scan
119122
accessGlobalSecretsAndServiceAccount: true
120123
# -- builtInTrivyServer The flag enables the usage of built-in trivy server in cluster. It also overrides the following trivy params with built-in values
121124
# trivy.mode = ClientServer and serverURL = http://<serverServiceName>.<trivy operator namespace>:4975
@@ -178,7 +181,11 @@ operator:
178181
# -- webhookSendDeletedReports the flag to enable sending deleted reports if webhookBroadcastURL is enabled
179182
webhookSendDeletedReports: false
180183

181-
# -- privateRegistryScanSecretsNames is map of namespace:secrets, secrets are comma seperated which can be used to authenticate in private registries in case if there no imagePullSecrets provided example : {"mynamespace":"mySecrets,anotherSecret"}
184+
# -- privateRegistryScanSecretsNames is a map of namespace:secrets, secrets are comma separated, which can be used to
185+
# authenticate in private registries in case no imagePullSecrets may be derived from pod's or serviceaccount's spec,
186+
# example : {"mynamespace":"mySecrets,anotherSecret"}
187+
# The setting is mutually exclusive with accessGlobalSecretsAndServiceAccount, the former must be set to false for
188+
# secrets from privateRegistryScanSecretsNames to be considered when pulling images to scan
182189
privateRegistryScanSecretsNames: {}
183190

184191
# -- mergeRbacFindingWithConfigAudit the flag to enable merging rbac finding with config-audit report

docs/tutorials/private-registries.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,11 @@ kubectl apply -f imagepullsecret.yaml -n app
216216
```
217217

218218
Next, we will change the `privateRegistryScanSecretsNames` of the `values.yaml` manifest. For this, we can create a new `values.yaml` manifest with our desired modification. We need to provide desired namespace and secret name. In our example they are `app` and `dockerconfigjson-github-com` accordingly.
219+
Note that `privateRegistryScanSecretsNames` are evaluated only when `accessGlobalSecretsAndServiceAccount` is set to `false`.
219220

220221
```sh
221222
operator:
223+
accessGlobalSecretsAndServiceAccount: false
222224
privateRegistryScanSecretsNames: {"app":"dockerconfigjson-github-com"}
223225
```
224226

0 commit comments

Comments
 (0)