Skip to content

Commit 30b3f19

Browse files
authored
Merge pull request #191 from appuio/feat/drop-empty-lokistack-config
Drop empty and null entries of parameter `components.lokistack`
2 parents d10ac93 + 69f3229 commit 30b3f19

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

component/log_lokistack.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local kube = import 'lib/kube.libjsonnet';
55

66
// The hiera parameters for the component
77
local inv = kap.inventory();
8-
local loki = inv.parameters.openshift4_logging.components.lokistack;
8+
local loki = std.prune(inv.parameters.openshift4_logging.components.lokistack);
99
local consolePlugin = inv.parameters.openshift4_logging.components.consolePlugin;
1010

1111
local lokistack_spec = {

docs/modules/ROOT/pages/references/parameters.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ The parameter `alerts.patch` allows users to customize upstream alerts.
9292
Configuration of the lokistack component.
9393
See subsections for supported keys.
9494

95+
NOTE: The component will drop keys with `null` and empty values.
96+
9597
=== `components.lokistack.enabled`
9698

9799
[horizontal]

tests/master.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ parameters:
3737
components:
3838
lokistack:
3939
internalAppLogsEnabled: false
40+
spec:
41+
storage:
42+
tls: null
4043

4144
clusterLogForwarder:
4245
filters:

0 commit comments

Comments
 (0)