From db08c1ae7fcf4b049413321a8b5d31edd5df5c2c Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Mon, 17 Apr 2023 18:36:53 +0200 Subject: [PATCH] fix: add missing logic to handle PVCs for extraVolumes (#1304) Signed-off-by: Peter Wilcsinszky --- pkg/resources/fluentd/statefulset.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/resources/fluentd/statefulset.go b/pkg/resources/fluentd/statefulset.go index 5eaa88cd4..3abc49616 100644 --- a/pkg/resources/fluentd/statefulset.go +++ b/pkg/resources/fluentd/statefulset.go @@ -48,8 +48,16 @@ func (r *Reconciler) statefulset() (runtime.Object, reconciler.DesiredState, err } } for _, n := range r.Logging.Spec.FluentdSpec.ExtraVolumes { - if err := n.ApplyVolumeForPodSpec(&spec.Template.Spec); err != nil { - return nil, reconciler.StatePresent, err + if n.Volume != nil && n.Volume.PersistentVolumeClaim != nil { + if err := n.Volume.ApplyPVCForStatefulSet(n.ContainerName, n.Path, spec, func(name string) metav1.ObjectMeta { + return r.FluentdObjectMeta(name, ComponentFluentd) + }); err != nil { + return nil, reconciler.StatePresent, err + } + } else { + if err := n.ApplyVolumeForPodSpec(&spec.Template.Spec); err != nil { + return nil, reconciler.StatePresent, err + } } }