Skip to content

Commit ca2c73f

Browse files
committed
ESO-155: fixes loop iteration to go through all volumes
Signed-off-by: Bharath B <[email protected]>
1 parent 84b4046 commit ca2c73f

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

pkg/controller/external_secrets/deployments.go

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -418,26 +418,22 @@ func updateWebhookVolumeConfig(deployment *appsv1.Deployment, esc *operatorv1alp
418418
}
419419

420420
func updateSecretVolumeConfig(deployment *appsv1.Deployment, volumeName, secretName string) {
421-
volumeExists := false
422421
for i := range deployment.Spec.Template.Spec.Volumes {
423422
if deployment.Spec.Template.Spec.Volumes[i].Name == volumeName {
424-
volumeExists = true
423+
if deployment.Spec.Template.Spec.Volumes[i].Secret == nil {
424+
deployment.Spec.Template.Spec.Volumes[i].Secret = &corev1.SecretVolumeSource{}
425+
}
426+
deployment.Spec.Template.Spec.Volumes[i].Secret.SecretName = secretName
427+
return
425428
}
426-
if deployment.Spec.Template.Spec.Volumes[i].Secret == nil {
427-
deployment.Spec.Template.Spec.Volumes[i].Secret = &corev1.SecretVolumeSource{}
428-
}
429-
deployment.Spec.Template.Spec.Volumes[i].Secret.SecretName = secretName
430-
break
431429
}
432430

433-
if !volumeExists {
434-
deployment.Spec.Template.Spec.Volumes = append(deployment.Spec.Template.Spec.Volumes, corev1.Volume{
435-
Name: volumeName,
436-
VolumeSource: corev1.VolumeSource{
437-
Secret: &corev1.SecretVolumeSource{
438-
SecretName: secretName,
439-
},
431+
deployment.Spec.Template.Spec.Volumes = append(deployment.Spec.Template.Spec.Volumes, corev1.Volume{
432+
Name: volumeName,
433+
VolumeSource: corev1.VolumeSource{
434+
Secret: &corev1.SecretVolumeSource{
435+
SecretName: secretName,
440436
},
441-
})
442-
}
437+
},
438+
})
443439
}

0 commit comments

Comments
 (0)