operator: Add ruler config support #6195

periklis · 2022-05-19T08:26:53Z

What this PR does / why we need it:
The following PR is a follow-up of #5986. It adds the RulerConfig custom resource definition as proposed by #5985

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

Documentation added
Tests updated
Is this an important fix or new feature? Add an entry in the CHANGELOG.md.
Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

grafanabot · 2022-05-19T08:31:44Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

grafanabot · 2022-05-24T04:58:25Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

grafanabot · 2022-05-24T12:08:40Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0.3%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

xperimental

First set of comments, about ⅔ through the PR.

operator/controllers/internal/lokistack/ruler_config_discovery.go

operator/api/v1beta1/rulerconfig_types.go

operator/config/crd/patches/cainjection_in_rulerconfigs.yaml

operator/config/crd/patches/webhook_in_rulerconfigs.yaml

operator/controllers/internal/lokistack/ruler_config_discovery.go

grafanabot · 2022-05-31T11:17:36Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0.3%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0.5%
+               loki	0%

xperimental

Done looking through the PR changes, have not tested it on a cluster yet though.

operator/api/v1beta1/rulerconfig_types.go

operator/internal/manifests/internal/config/loki-config.yaml

operator/controllers/internal/lokistack/ruler_config_discovery.go

operator/internal/handlers/internal/secrets/secrets.go

operator/internal/manifests/internal/config/options.go

operator/internal/manifests/options.go

grafanabot · 2022-05-31T16:58:57Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

grafanabot · 2022-06-01T11:55:42Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

grafanabot · 2022-06-01T14:16:21Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

grafanabot · 2022-06-01T16:06:18Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0.3%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

grafanabot · 2022-06-01T16:39:33Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

operator/internal/handlers/internal/rules/secrets.go

Co-authored-by: Robert Jacob <xperimental@solidproject.de>

grafanabot · 2022-06-02T15:25:29Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0.3%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

operator/internal/handlers/internal/rules/secrets.go

Co-authored-by: Robert Jacob <xperimental@solidproject.de>

grafanabot · 2022-06-02T16:41:31Z

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

periklis added the sig/operator label May 19, 2022

periklis self-assigned this May 19, 2022

pull-request-size bot added the size/XXL label May 19, 2022

periklis force-pushed the ruler-config-support branch from 9a93259 to 6676336 Compare May 24, 2022 04:53

periklis marked this pull request as ready for review May 24, 2022 04:53

periklis requested a review from a team as a code owner May 24, 2022 04:53

periklis force-pushed the ruler-config-support branch from 6676336 to 4e4a43a Compare May 24, 2022 12:02

periklis requested a review from xperimental May 24, 2022 12:06

xperimental reviewed May 30, 2022

View reviewed changes

xperimental requested changes May 31, 2022

View reviewed changes

periklis added 5 commits June 1, 2022 16:09

Add support for ruler config CRD

75c1f21

Fix CRD display name

dbf28a7

Fix review comments on rulerconfig types

07d2245

Remove obsolete files

60aefb0

Fix review comments

b4ceadb

periklis force-pushed the ruler-config-support branch from 033bbf8 to b4ceadb Compare June 1, 2022 14:11

Fix authorization enumeration

e4dac1c

periklis added 2 commits June 1, 2022 18:31

Fix rulerconfig sample

9f74b7f

Fix rendering headers

02f2107

periklis enabled auto-merge (squash) June 1, 2022 16:36

xperimental reviewed Jun 1, 2022

View reviewed changes

operator/internal/handlers/internal/rules/secrets.go Outdated Show resolved Hide resolved

periklis and others added 2 commits June 1, 2022 21:16

Update operator/internal/handlers/internal/rules/secrets.go

ec51572

Co-authored-by: Robert Jacob <xperimental@solidproject.de>

Fix emptyness checks

16ce670

xperimental reviewed Jun 2, 2022

View reviewed changes

operator/internal/handlers/internal/rules/secrets.go Outdated Show resolved Hide resolved

periklis and others added 2 commits June 2, 2022 18:28

Update operator/internal/handlers/internal/rules/secrets.go

7d21e56

Co-authored-by: Robert Jacob <xperimental@solidproject.de>

Add changelog entry

bff08cf

xperimental approved these changes Jun 2, 2022

View reviewed changes

periklis merged commit 4c3e276 into grafana:main Jun 2, 2022

This was referenced Jun 28, 2022

dannykopping/remove cache stats dannykopping/loki#13

Closed

dannykopping/remove cache stats dannykopping/loki#14

Draft

Red-GV mentioned this pull request Aug 8, 2022

operator: Add support for ruler component #5211

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

operator: Add ruler config support #6195

operator: Add ruler config support #6195

periklis commented May 19, 2022

grafanabot commented May 19, 2022

grafanabot commented May 24, 2022

grafanabot commented May 24, 2022

xperimental left a comment

grafanabot commented May 31, 2022

xperimental left a comment

grafanabot commented May 31, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 2, 2022

grafanabot commented Jun 2, 2022

operator: Add ruler config support #6195

operator: Add ruler config support #6195

Conversation

periklis commented May 19, 2022

grafanabot commented May 19, 2022

grafanabot commented May 24, 2022

grafanabot commented May 24, 2022

xperimental left a comment

Choose a reason for hiding this comment

grafanabot commented May 31, 2022

xperimental left a comment

Choose a reason for hiding this comment

grafanabot commented May 31, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 1, 2022

grafanabot commented Jun 2, 2022

grafanabot commented Jun 2, 2022