8000 Fixed File Mount Options For Hook CRD by nigthknight · Pull Request #337 · secureCodeBox/secureCodeBox · GitHub
[go: up one dir, main page]
Skip to content

Fixed File Mount Options For Hook CRD #337

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 1 commit into from
Mar 24, 2021
Merged

Fixed File Mount Options For Hook CRD #337

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
17 changes: 17 additions & 0 deletions operator/controllers/execution/scans/hook_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,23 @@ func (r *ScanReconciler) createJobForHook(hook *executionv1.ScanCompletionHook,
r.Log.V(8).Info("Configuring customCACerts for Hook")
injectCustomCACertsIfConfigured(job)

// Merge Env from HookTemplate
job.Spec.Template.Spec.Containers[0].Env = append(
job.Spec.Template.Spec.Containers[0].Env,

hook.Spec.Env...,
)
// Merge VolumeMounts from HookTemplate
job.Spec.Template.Spec.Containers[0].VolumeMounts = append(
job.Spec.Template.Spec.Containers[0].VolumeMounts,
hook.Spec.VolumeMounts...,
)
// Merge Volumes from HookTemplate
job.Spec.Template.Spec.Volumes = append(
job.Spec.Template.Spec.Volumes,
hook.Spec.Volumes...,
)

if err := ctrl.SetControllerReference(scan, job, r.Scheme); err != nil {
r.Log.Error(err, "Unable to set controllerReference on job", "job", job)
return "", err
Expand Down
0