fix nil pointer reference

Signed-off-by: juicer <[email protected]>
fluent · Jul 5, 2024 · c5e306f · c5e306f
1 parent cb16289
commit c5e306f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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 |
+| sslVerify | Optional, Force certificate validation | *bool |
diff --git 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