Merge pull request #1443 from cbuto/feat/buffer-sidecar-mount-name

fix(fluentd): Use buffer volume mount name from spec instead of default
kube-logging · Aug 30, 2023 · aa83b92 · aa83b92
2 parents 40592fb + 820888e
commit aa83b92
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/pkg/resources/fluentd/statefulset.go b/pkg/resources/fluentd/statefulset.go
@@ -356,7 +356,7 @@ func (r *Reconciler) volumeMountHackContainer() *corev1.Container {
 			Command:         []string{"sh", "-c", "chmod -R 777 " + bufferPath},
 			VolumeMounts: []corev1.VolumeMount{
 				{
-					Name:      r.Logging.QualifiedName(v1beta1.DefaultFluentdBufferStorageVolumeName),
+					Name:      r.bufferVolumeName(),
 					MountPath: bufferPath,
 				},
 			},
@@ -387,7 +387,7 @@ func (r *Reconciler) bufferMetricsSidecarContainer() *corev1.Container {
 			Ports:           generatePortsBufferVolumeMetrics(r.Logging.Spec.FluentdSpec),
 			VolumeMounts: []corev1.VolumeMount{
 				{
-					Name:      r.Logging.QualifiedName(v1beta1.DefaultFluentdBufferStorageVolumeName),
+					Name:      r.bufferVolumeName(),
 					MountPath: bufferPath,
 				},
 			},
@@ -397,6 +397,14 @@ func (r *Reconciler) bufferMetricsSidecarContainer() *corev1.Container {
 	return nil
 }
 
+func (r *Reconciler) bufferVolumeName() string {
+	volumeName := r.Logging.QualifiedName(v1beta1.DefaultFluentdBufferStorageVolumeName)
+	if r.Logging.Spec.FluentdSpec.BufferStorageVolume.PersistentVolumeClaim != nil {
+		volumeName = r.Logging.QualifiedName(r.Logging.Spec.FluentdSpec.BufferStorageVolume.PersistentVolumeClaim.PersistentVolumeSource.ClaimName)
+	}
+	return volumeName
+}
+
 func generateReadinessCheck(spec *v1beta1.FluentdSpec) *corev1.Probe {
 	if spec.ReadinessProbe != nil {
 		return spec.ReadinessProbe