Skip to content

Commit d3e9cca

Browse files
committed
Fix CA Certificate Volume For Lurcher
Signed-off-by: Yannik Fuhrmeister <yannik.fuhrmeister@iteratec.com>
1 parent 1a61f0e commit d3e9cca

3 files changed

Lines changed: 17 additions & 10 deletions

File tree

‎operator/controllers/execution/scans/scan_reconciler.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,21 @@ func (r *ScanReconciler) constructJobForScan(scan *executionv1.Scan, scanType *e
278278

279279
lurcherCustomCaCertificate := os.Getenv("LURCHER_CUSTOM_CA_CERTIFICATE_EXISTING_CERTIFICATE")
280280
if lurcherCustomCaCertificate != "" {
281-
281+
fmt.Println("Reach the Volume creation")
282282
job.Spec.Template.Spec.Volumes = append(job.Spec.Template.Spec.Volumes, corev1.Volume{
283-
Name: "scan-results",
283+
Name: "ca-certificate",
284284
VolumeSource: corev1.VolumeSource{
285-
ConfigMap: &corev1.ConfigMapVolumeSource{},
285+
ConfigMap: &corev1.ConfigMapVolumeSource{
286+
LocalObjectReference: corev1.LocalObjectReference{
287+
Name: lurcherCustomCaCertificate,
288+
},
289+
},
286290
},
287291
})
292+
288293
certificateName := os.Getenv("LURCHER_CUSTOM_CA_CERTIFICATE_NAME")
289294
lurcherSidecar.VolumeMounts = append(lurcherSidecar.VolumeMounts, corev1.VolumeMount{
290-
Name: certificateName,
295+
Name: "ca-certificate",
291296
ReadOnly: true,
292297
MountPath: "/etc/ssl/certs/" + certificateName,
293298
SubPath: certificateName,

‎operator/templates/manager/manager.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,12 @@ spec:
9797
value: "{{ .Values.lurcher.image.repository }}:{{ .Values.lurcher.image.tag | default .Chart.Version }}"
9898
- name: LURCHER_PULL_POLICY
9999
value: {{ .Values.lurcher.image.pullPolicy }}
100+
{{- if .Values.lurcher.customCACertificate.existingCertificate }}
100101
- name: LURCHER_CUSTOM_CA_CERTIFICATE_EXISTING_CERTIFICATE
101102
value: "{{ .Values.lurcher.customCACertificate.existingCertificate }}"
102103
- name: LURCHER_CUSTOM_CA_CERTIFICATE_NAME
103-
value: "{{ .Values.lurcher.customCACertificate.certificate }}""
104+
value: "{{ .Values.lurcher.customCACertificate.certificate }}"
105+
{{ end }}
104106
resources:
105107
{{- toYaml .Values.resources | nindent 12 }}
106108
securityContext:

‎operator/values.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ lurcher:
4545
# lurcher.image.pullPolicy -- Image pull policy
4646
pullPolicy: Always
4747
# Setup for Custom CA certificates
48-
customCACertificate:
49-
# configMap name
50-
existingCertificate: cert-map
51-
# certificate name
52-
certificate: "public.crt"
48+
customCACertificate:
49+
# configMap name
50+
existingCertificate: cert-map
51+
# certificate name
52+
certificate: "public.crt"
5353

5454
minio:
5555
# minio.enabled Enable this to use minio as storage backend instead of a cloud bucket provider like AWS S3, Google Cloud Storage, DigitalOcean Spaces etc.

0 commit comments

Comments
 (0)