Merge pull request #1304 from kube-logging/extravolume-pvc

fix: add missing logic to handle PVCs for extraVolumes
kube-logging · Apr 19, 2023 · 9337f12 · 9337f12
2 parents d284d6e + ce1ee55
commit 9337f12
Showing 1 changed file with 10 additions and 2 deletions.
diff --git 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
+ }
  }
  }