Merge pull request #214 from periklis/release-5.7-backport-pr-11288

[release-5.7] Backport PR grafana#11288
openshift · Nov 24, 2023 · fc4a584 · fc4a584
2 parents 459b9a9 + 2e836cf
commit fc4a584
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## Main
 
+## Release 5.7.9
+
+- [11288](https://github.com/grafana/loki/pull/11288) **periklis**: Fix custom CA for object-store in ruler component
+
+## Release 5.7.8
+
+No changes.
+
 ## Release 5.7.7
 
 - [10924](https://github.com/grafana/loki/pull/10924) **periklis**: Update Loki operand to v2.9.2

diff --git a/operator/internal/manifests/ruler.go b/operator/internal/manifests/ruler.go
@@ -7,6 +7,7 @@ import (
 	lokiv1 "github.com/grafana/loki/operator/apis/loki/v1"
 	"github.com/grafana/loki/operator/internal/manifests/internal/config"
 	"github.com/grafana/loki/operator/internal/manifests/openshift"
+	"github.com/grafana/loki/operator/internal/manifests/storage"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -27,6 +28,10 @@ func BuildRuler(opts Options) ([]client.Object, error) {
 		}
 	}
 
+	if err := storage.ConfigureStatefulSet(statefulSet, opts.ObjectStorage); err != nil {
+		return nil, err
+	}
+
 	if opts.Gates.GRPCEncryption {
 		if err := configureRulerGRPCServicePKI(statefulSet, opts); err != nil {
 			return nil, err