Skip to content

Commit

Permalink
operator: Fix custom CA for object-store in ruler component (#11288)
Browse files Browse the repository at this point in the history
Co-authored-by: Robert Jacob <[email protected]>
  • Loading branch information
periklis and xperimental authored Nov 23, 2023
1 parent 7200c4b commit 6b944f7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions operator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## Main

- [11288](https://github.com/grafana/loki/pull/11288) **periklis**: Fix custom CA for object-store in ruler component
- [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
Expand Down
5 changes: 5 additions & 0 deletions operator/internal/manifests/ruler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 6b944f7

Please sign in to comment.