Add nil-check for loki.enable (#385)

* Add nil-check for loki.enable * Loki/console enable nil must be seen as true
netobserv · Jun 29, 2023 · 57a6951 · 57a6951
1 parent e2d77a1
commit 57a6951
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/controllers/flowlogspipeline/flp_common_objects.go b/controllers/flowlogspipeline/flp_common_objects.go
@@ -439,7 +439,7 @@ func (b *builder) addTransformStages(stage *config.PipelineBuilderStage) (*corev
 	})
 
 	// loki stage (write) configuration
-	if *b.desired.Loki.Enable {
+	if helper.UseLoki(b.desired) {
 		lokiWrite := api.WriteLoki{
 			Labels:         indexFields,
 			BatchSize:      int(b.desired.Loki.BatchSize),

diff --git a/pkg/helper/flowcollector.go b/pkg/helper/flowcollector.go
@@ -91,8 +91,15 @@ func UseSASL(cfg *flowslatest.SASLConfig) bool {
 	return cfg.Type == flowslatest.SASLPlain || cfg.Type == flowslatest.SASLScramSHA512
 }
 
+func UseLoki(spec *flowslatest.FlowCollectorSpec) bool {
+	// nil should fallback to default value, which is "true"
+	return spec.Loki.Enable == nil || *spec.Loki.Enable
+}
+
 func UseConsolePlugin(spec *flowslatest.FlowCollectorSpec) bool {
-	return PtrBool(spec.Loki.Enable) && PtrBool(spec.ConsolePlugin.Enable)
+	return UseLoki(spec) &&
+		// nil should fallback to default value, which is "true"
+		(spec.ConsolePlugin.Enable == nil || *spec.ConsolePlugin.Enable)
 }
 
 func PtrBool(b *bool) bool {