From c5e306f5837727c137a2035594786093c5f713f4 Mon Sep 17 00:00:00 2001 From: juicer Date: Thu, 4 Jul 2024 21:30:38 -0700 Subject: [PATCH] fix nil pointer reference Signed-off-by: juicer --- .../crd/bases/fluentd.fluent.io_outputs.yaml | 3 +++ controllers/fluentbitconfig_controller.go | 22 ++++++++++--------- docs/plugins/fluentd/output/opensearch.md | 2 +- manifests/setup/fluent-operator-crd.yaml | 3 +++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/config/crd/bases/fluentd.fluent.io_outputs.yaml b/config/crd/bases/fluentd.fluent.io_outputs.yaml index 0da25d5f9..d6b155b3e 100644 --- a/config/crd/bases/fluentd.fluent.io_outputs.yaml +++ b/config/crd/bases/fluentd.fluent.io_outputs.yaml @@ -2146,6 +2146,9 @@ spec: description: 'Specify https if your Opensearch endpoint supports SSL (default: http).' type: string + sslVerify: + description: Optional, Force certificate validation + type: boolean user: description: Optional, The login credentials to connect to Opensearch diff --git a/controllers/fluentbitconfig_controller.go b/controllers/fluentbitconfig_controller.go index ade7d38fa..9b70537bd 100644 --- a/controllers/fluentbitconfig_controller.go +++ b/controllers/fluentbitconfig_controller.go @@ -403,16 +403,18 @@ func (r *FluentBitConfigReconciler) generateRewriteTagConfig( md5.Sum([]byte(cfg.Namespace)), ), ) - if cfg.Spec.Service.EmitterName != "" { - buf.WriteString(fmt.Sprintf(" Emitter_Name %s\n", cfg.Spec.Service.EmitterName)) - } else { - buf.WriteString(fmt.Sprintf(" Emitter_Name re_emitted_%x\n", md5.Sum([]byte(cfg.Namespace)))) - } - if cfg.Spec.Service.EmitterStorageType != "" { - buf.WriteString(fmt.Sprintf(" Emitter_Storage.type %s\n", cfg.Spec.Service.EmitterStorageType)) - } - if cfg.Spec.Service.EmitterMemBufLimit != "" { - buf.WriteString(fmt.Sprintf(" Emitter_Mem_Buf_Limit %s\n", cfg.Spec.Service.EmitterMemBufLimit)) + if cfg.Spec.Service != nil { + if cfg.Spec.Service.EmitterName != "" { + buf.WriteString(fmt.Sprintf(" Emitter_Name %s\n", cfg.Spec.Service.EmitterName)) + } else { + buf.WriteString(fmt.Sprintf(" Emitter_Name re_emitted_%x\n", md5.Sum([]byte(cfg.Namespace)))) + } + if cfg.Spec.Service.EmitterStorageType != "" { + buf.WriteString(fmt.Sprintf(" Emitter_Storage.type %s\n", cfg.Spec.Service.EmitterStorageType)) + } + if cfg.Spec.Service.EmitterMemBufLimit != "" { + buf.WriteString(fmt.Sprintf(" Emitter_Mem_Buf_Limit %s\n", cfg.Spec.Service.EmitterMemBufLimit)) + } } return buf.String() } diff --git a/docs/plugins/fluentd/output/opensearch.md b/docs/plugins/fluentd/output/opensearch.md index 403c1ddbc..a90e09a6a 100644 --- a/docs/plugins/fluentd/output/opensearch.md +++ b/docs/plugins/fluentd/output/opensearch.md @@ -15,4 +15,4 @@ Opensearch defines the parameters for out_opensearch plugin | logstashPrefix | LogstashPrefix defines the logstash prefix index name to write events when logstash_format is true (default: logstash). | *string | | user | Optional, The login credentials to connect to Opensearch | *[plugins.Secret](../secret.md) | | password | Optional, The login credentials to connect to Opensearch | *[plugins.Secret](../secret.md) | -| sslVerify | Optional, Force certificate validation | *bool | \ No newline at end of file +| sslVerify | Optional, Force certificate validation | *bool | diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml index 8b03427fe..2a5323c5b 100644 --- a/manifests/setup/fluent-operator-crd.yaml +++ b/manifests/setup/fluent-operator-crd.yaml @@ -36042,6 +36042,9 @@ spec: description: 'Specify https if your Opensearch endpoint supports SSL (default: http).' type: string + sslVerify: + description: Optional, Force certificate validation + type: boolean user: description: Optional, The login credentials to connect to Opensearch