Merge pull request #1543 from sandy2008/patch-1

fix(crd): disallow null values for logfmt parser to prevent fluent-bit crash

Author: wenchajun

apis/fluentbit/v1alpha2/clusterparser_types.go

@@ -42,6 +42,7 @@ type ParserSpec struct {
 	// LTSV defines ltsv parser configuration.
 	LTSV *parser.LSTV `json:"ltsv,omitempty"`
 	// Logfmt defines logfmt parser configuration.
+	// +kubebuilder:validation:XValidation:rule="self != null",message="logfmt must not be null"
 	Logfmt *parser.Logfmt `json:"logfmt,omitempty"`
 	// Decoders are a built-in feature available through the Parsers file, each Parser definition can optionally set one or multiple decoders.
 	// There are two type of decoders type: Decode_Field and Decode_Field_As.

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterparsers.yaml

@@ -75,6 +75,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties:

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_parsers.yaml

@@ -75,6 +75,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties:

config/crd/bases/fluentbit.fluent.io_clusterparsers.yaml

@@ -75,6 +75,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties:

config/crd/bases/fluentbit.fluent.io_parsers.yaml

@@ -75,6 +75,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties:

manifests/setup/fluent-operator-crd.yaml

@@ -10977,6 +10977,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties:
@@ -39807,6 +39810,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties:

manifests/setup/setup.yaml

@@ -10977,6 +10977,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties:
@@ -39807,6 +39810,9 @@ spec:
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
                 type: object
+                x-kubernetes-validations:
+                - message: logfmt must not be null
+                  rule: self != null
               ltsv:
                 description: LTSV defines ltsv parser configuration.
                 properties: