Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change default LokiStack size to 1x.pico #166

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Change default LokiStack size to 1x.pico #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions class/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ parameters:
endpoint: ''
bucketnames: '${cluster:name}-logstore'
spec:
size: 1x.demo
size: 1x.pico
storage:
schemas:
- version: v12
Expand All @@ -40,11 +40,6 @@ parameters:
storageClassName: ''
tenants:
mode: openshift-logging
limits:
global:
ingestion:
ingestionBurstSize: 9
ingestionRate: 5
logmetrics:
enabled: false
spec:
Expand Down
9 changes: 8 additions & 1 deletion component/log_lokistack.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,15 @@ local po = import 'lib/patch-operator.libsonnet';
local inv = kap.inventory();
local loki = inv.parameters.openshift4_logging.components.lokistack;


local lokistack_spec = {
[if loki.spec.size == '1x.demo' then 'limits']: {
global: {
ingestion: {
ingestionBurstSize: 9,
ingestionRate: 5,
},
},
},
template: {
compactor: {
[if loki.spec.size == '1x.demo' then 'replicas']: 1,
Expand Down
9 changes: 1 addition & 8 deletions docs/modules/ROOT/pages/references/parameters.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ default::
[source,yaml]
----
spec:
size: 1x.extra-small
size: 1x.pico
storage:
schemas:
- version: v13
Expand All @@ -159,14 +159,7 @@ spec:
storageClassName: ''
tenants:
mode: openshift-logging
limits:
global:
ingestion:
ingestionBurstSize: 9 <1>
ingestionRate: 5 <2>
----
<1> value in MiB (per push event)
<2> value in MiB/s

A dictionary holding the `.spec` for the LokiStack resource.

Expand Down
15 changes: 1 addition & 14 deletions tests/golden/defaults/openshift4-logging/openshift4-logging/30_loki_stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ metadata:
name: loki
name: loki
spec:
limits:
global:
ingestion:
ingestionBurstSize: 9
ingestionRate: 5
size: 1x.demo
size: 1x.pico
storage:
schemas:
- effectiveDate: '2022-06-01'
Expand All @@ -28,34 +23,26 @@ spec:
compactor:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 1
distributor:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
gateway:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
indexGateway:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
ingester:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
querier:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
queryFrontend:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
ruler:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 1
tenants:
mode: openshift-logging
15 changes: 1 addition & 14 deletions tests/golden/master/openshift4-logging/openshift4-logging/30_loki_stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ metadata:
name: loki
name: loki
spec:
limits:
global:
ingestion:
ingestionBurstSize: 9
ingestionRate: 5
size: 1x.demo
size: 1x.pico
storage:
schemas:
- effectiveDate: '2022-06-01'
Expand All @@ -28,34 +23,26 @@ spec:
compactor:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 1
distributor:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
gateway:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
indexGateway:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
ingester:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
querier:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
queryFrontend:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 2
ruler:
nodeSelector:
node-role.kubernetes.io/infra: ''
replicas: 1
tenants:
mode: openshift-logging
Loading