Merge pull request #213 from periklis/release-5.8-backport-pr-11288

openshift · Nov 24, 2023 · c9bc025 · c9bc025
2 parents 8f7b11e + a112bfc
commit c9bc025
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -1,15 +1,18 @@
 ## Main
 
-## Release 5.8.2
-
-- [11022](https://github.com/grafana/loki/pull/11022) **JoaoBraveCoding**: Remove outdated BoltDB dashboards
-
 ## Release 5.8.1
 
-- None
+- [11288](https://github.com/grafana/loki/pull/11288) **periklis**: Fix custom CA for object-store in ruler component
+- [11022](https://github.com/grafana/loki/pull/11022) **JoaoBraveCoding**: Remove outdated BoltDB dashboards
 
 ## Release 5.8.0
 
+- [11091](https://github.com/grafana/loki/pull/11091) **periklis**: Add automatic stream sharding support
+- [11022](https://github.com/grafana/loki/pull/11022) **JoaoBraveCoding**: Remove outdated BoltDB dashboards 
+- [10932](https://github.com/grafana/loki/pull/10932) **JoaoBraveCoding**: Adds new value v13 to schema
+- [11232](https://github.com/grafana/loki/pull/11232) **periklis**: Update dependencies and dev tools
+- [11129](https://github.com/grafana/loki/pull/11129) **periklis**: Update deps to secure webhooks for CVE-2023-44487
+- 
 ## 0.5.0 (2023-10-24)
 
 - [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
@@ -17,6 +17,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"
 )
 
 // BuildRuler returns a list of k8s objects for Loki Stack Ruler
@@ -28,6 +29,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