From 2e836cf1fc6c9d19bc3e92a96aa3da52908890fb Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 23 Nov 2023 15:40:33 +0100 Subject: [PATCH] operator: Fix custom CA for object-store in ruler component (#11288) Co-authored-by: Robert Jacob --- operator/CHANGELOG.md | 8 ++++++++ operator/internal/manifests/ruler.go | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 7cfb8bd2f487..09d8f393831e 100644 --- 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 index e902d03a4a20..5d8ee4e2084e 100644 --- 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