Skip to content

ROX-33574: Don't forget to configure scanner pull secrets #19383

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

Open
mclasmeier wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −7
Open

ROX-33574: Don't forget to configure scanner pull secrets #19383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions image/templates/helm/stackrox-secured-cluster/templates/_init.tpl.htpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,12 @@ The following block checks for the validity of the provided init bundle. (`helm
{{ include "srox.fail" "A CA certificate must be specified (please make sure that either an init bundle or a cluster registration secret has been provided)" }}
{{- end }}

{{ $imagePullSecretNames := list "stackrox" }}
[<- if not .KubectlOutput ->]
{{/*
Scanner setup.
*/}}

{{ $imagePullSecretNames := list }}

{{ $anyScannerEnabled := or (eq ._rox.scanner.disable false) (eq ._rox.scannerV4.disable false) }}
{{ if $anyScannerEnabled }}
Expand Down Expand Up @@ -387,12 +387,6 @@ The following block checks for the validity of the provided init bundle. (`helm
{{ $imagePullSecretNames = append $imagePullSecretNames "stackrox-scanner-v4" }}
{{ end }}

{{ if not (empty $imagePullSecretNames) }}
{{ $imagePullSecretNames = append $imagePullSecretNames "stackrox" }}
{{/* Note: This must happen late, as we rely on "srox.configureImage" to collect the
set of all referenced images first. */}}
{{ include "srox.configureImagePullSecrets" (list $ "imagePullSecrets" $._rox.imagePullSecrets "secured-cluster-services-main" $imagePullSecretNames $.Release.Namespace) }}
{{ end }}
{{ end }}

[<- end >]
Expand All @@ -403,6 +397,7 @@ The following block checks for the validity of the provided init bundle. (`helm
set of all referenced images first. */}}
{{ include "srox.configureImagePullSecrets" (list $ "mainImagePullSecrets" $._rox.mainImagePullSecrets "secured-cluster-services-main" (list "stackrox") $._rox._namespace) }}
{{ include "srox.configureImagePullSecrets" (list $ "collectorImagePullSecrets" $._rox.collectorImagePullSecrets "secured-cluster-services-collector" (list "stackrox" "collector-stackrox") $._rox._namespace) }}
{{ include "srox.configureImagePullSecrets" (list $ "imagePullSecrets" $._rox.imagePullSecrets "secured-cluster-services-main" $imagePullSecretNames $._rox._namespace) }}

{{/* Derive internal representation of specific chart configuration settings. */}}

Expand Down
16 changes: 16 additions & 0 deletions pkg/helm/charts/tests/securedclusterservices/testdata/helmtest/image-pull-secrets.test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,29 @@ expect: |
assumeThat(.error == null) | .serviceaccounts["collector"] | saNotRefersTo(["stackrox", "stackrox-scanner", "collector-stackrox"])
assumeThat(.error == null) | .serviceaccounts["sensor"] | saNotRefersTo(["stackrox", "stackrox-scanner", "collector-stackrox"])
assumeThat(.error == null) | .serviceaccounts["admission-control"] | saNotRefersTo(["stackrox", "stackrox-scanner", "collector-stackrox"])
assumeThat(.error == null) | .serviceaccounts["scanner"] | saNotRefersTo(["stackrox", "stackrox-scanner", "collector-stackrox"])

# Ensure that sensor and admission-control secrets do not reference the collector secrets in the non-error case.

assumeThat(.error == null) | .serviceaccounts["sensor"] | saNotRefersTo(["secured-cluster-services-collector", "collector-stackrox"])
assumeThat(.error == null) | .serviceaccounts["admission-control"] | saNotRefersTo(["secured-cluster-services-collector", "collector-stackrox"])
assumeThat(.error == null) | .serviceaccounts["scanner"] | saNotRefersTo(["secured-cluster-services-collector", "collector-stackrox"])

tests:
- name: "scanner service account references image pull secrets if scanner V4 is disabled"
values:
scanner:
disable: false
scannerV4:
disable: true
tests:
- name: "if image pull secrets are specified"
values:
imagePullSecrets:
username: euler
password: "0.57721"
expect: |
.serviceaccounts["scanner"] | saRefersTo(["secured-cluster-services-main"])
- name: "with no image pull secret creation"
expect: |
.secrets?["secured-cluster-services-main"]? | assertThat(. == null)
Expand Down
Loading