Skip to content
This repository was archived by the owner on Oct 14, 2020. It is now read-only.

Commit 95a0d09

Browse files
committed
Add additional env vars for the parse job to be able to find the scan in the k8s api
1 parent f5c4fd2 commit 95a0d09

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

operator/controllers/scan_controller.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ func (r *ScanReconciler) startParser(scan *scansv1.Scan) error {
264264
rules := []rbacv1.PolicyRule{
265265
rbacv1.PolicyRule{
266266
APIGroups: []string{"scans.experimental.securecodebox.io"},
267-
Resources: []string{"scans"},
268-
Verbs: []string{"get", "update"},
267+
Resources: []string{"scans/status"},
268+
Verbs: []string{"get", "patch"},
269269
},
270270
}
271271
r.EnsureServiceAccountExists(
@@ -275,7 +275,7 @@ func (r *ScanReconciler) startParser(scan *scansv1.Scan) error {
275275
rules,
276276
)
277277

278-
automountServiceAccountToken := false
278+
automountServiceAccountToken := true
279279
job := &batch.Job{
280280
ObjectMeta: metav1.ObjectMeta{
281281
Annotations: make(map[string]string),
@@ -293,6 +293,20 @@ func (r *ScanReconciler) startParser(scan *scansv1.Scan) error {
293293
{
294294
Name: "parser",
295295
Image: parseDefinition.Spec.Image,
296+
Env: []corev1.EnvVar{
297+
corev1.EnvVar{
298+
Name: "NAMESPACE",
299+
ValueFrom: &corev1.EnvVarSource{
300+
FieldRef: &corev1.ObjectFieldSelector{
301+
FieldPath: "metadata.namespace",
302+
},
303+
},
304+
},
305+
corev1.EnvVar{
306+
Name: "SCAN_NAME",
307+
Value: scan.Name,
308+
},
309+
},
296310
Args: []string{
297311
rawResultDownloadURL,
298312
findingsUploadURL.String(),

0 commit comments

Comments
 (0)