Skip to content

Allow configuration of imagePullSecret for all trivy components #2929

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

Merged
J12934 merged 2 commits into from
Mar 7, 2025
Merged

Allow configuration of imagePullSecret for all trivy components #2929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d90bd7
Allow configuration of imagePullSecret for all trivy components
K4iM4k3r Mar 5, 2025
37668ff
Update helm snapshot with the now expected image pull secrets
J12934 Mar 7, 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
3 changes: 2 additions & 1 deletion CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@ Committing with `git commit -s` will add the sign-off at the end of the commit m
- Tobias Stenby Brixen <[email protected]>
- Eline Henriksen <[email protected]>
- Michael Kruggel <[email protected]>
- Ochi Daiki <[email protected]>
- Ochi Daiki <[email protected]>
- Kai Schäfer <[email protected]>
4 changes: 4 additions & 0 deletions scanners/trivy/templates/trivy-database-cache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ spec:
labels:
app: trivy-database
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: trivy-database
image: "{{ .Values.scanner.image.repository }}:{{ .Values.scanner.image.tag | default .Chart.AppVersion }}"
Expand Down
12 changes: 12 additions & 0 deletions scanners/trivy/templates/trivy-scan-type.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ spec:
{{- end }}
template:
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 12 }}
{{- end }}
restartPolicy: OnFailure
affinity:
{{- toYaml .Values.scanner.affinity | nindent 12 }}
Expand Down Expand Up @@ -216,6 +220,10 @@ spec:
{{- toYaml .Values.scanner.affinity | nindent 12 }}
tolerations:
{{- toYaml .Values.scanner.tolerations | nindent 12 }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 12 }}
{{- end }}
containers:
- name: trivy
image: "{{ .Values.scanner.image.repository }}:{{ .Values.scanner.image.tag | default .Chart.AppVersion }}"
Expand Down Expand Up @@ -267,6 +275,10 @@ spec:
{{- end }}
template:
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 12 }}
{{- end }}
restartPolicy: OnFailure
affinity:
{{- toYaml .Values.scanner.affinity | nindent 12 }}
Expand Down
8 changes: 8 additions & 0 deletions scanners/trivy/tests/__snapshot__/scanner_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ matches the snapshot:
initialDelaySeconds: 5
periodSeconds: 10
successThreshold: 1
imagePullSecrets:
- name: foo
3: |
apiVersion: execution.securecodebox.io/v1
kind: ParseDefinition
Expand Down Expand Up @@ -256,6 +258,8 @@ matches the snapshot:
volumeMounts: []
- image: bar
name: foo
imagePullSecrets:
- name: foo
restartPolicy: OnFailure
tolerations:
- foo: bar
Expand Down Expand Up @@ -307,6 +311,8 @@ matches the snapshot:
volumeMounts: []
- image: bar
name: foo
imagePullSecrets:
- name: foo
restartPolicy: OnFailure
tolerations:
- foo: bar
Expand Down Expand Up @@ -357,6 +363,8 @@ matches the snapshot:
volumeMounts: []
- image: bar
name: foo
imagePullSecrets:
- name: foo
restartPolicy: OnFailure
serviceAccountName: trivy-k8s
tolerations:
Expand Down
Loading