Add Worker support to fluentd spec

kube-logging · Jun 24, 2020 · d959ac1 · d959ac1
1 parent 628074c
commit d959ac1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -4597,6 +4597,9 @@ spec:
                   type: object
                 volumeMountChmod:
                   type: boolean
+                workers:
+                  format: int32
+                  type: integer
               type: object
             loggingRef:
               type: string

diff --git a/config/crd/bases/logging.banzaicloud.io_loggings.yaml b/config/crd/bases/logging.banzaicloud.io_loggings.yaml
@@ -4597,6 +4597,9 @@ spec:
                   type: object
                 volumeMountChmod:
                   type: boolean
+                workers:
+                  format: int32
+                  type: integer
               type: object
             loggingRef:
               type: string

diff --git a/pkg/resources/fluentd/config.go b/pkg/resources/fluentd/config.go
@@ -26,6 +26,7 @@ var fluentdInputTemplate = `
 <system>
   rpc_endpoint 127.0.0.1:24444
   log_level {{ .LogLevel }}
+  workers {{ .Workers }}
 </system>
 
 # Prometheus monitoring

diff --git a/pkg/resources/fluentd/configsecret.go b/pkg/resources/fluentd/configsecret.go
@@ -32,6 +32,7 @@ type fluentdConfig struct {
 		Port    int32
 		Path    string
 	}
+	Workers int32
 }
 
 func generateConfig(input fluentdConfig) (string, error) {
@@ -67,6 +68,12 @@ func (r *Reconciler) secretConfig() (runtime.Object, reconciler.DesiredState, er
 		input.LogLevel = "info"
 	}
 
+	if r.Logging.Spec.FluentdSpec.Workers > 0 {
+		input.Workers = r.Logging.Spec.FluentdSpec.Workers
+	} else {
+		input.Workers = 1
+	}
+
 	inputConfig, err := generateConfig(input)
 	if err != nil {
 		return nil, reconciler.StatePresent, err

diff --git a/pkg/sdk/api/v1beta1/fluentd_types.go b/pkg/sdk/api/v1beta1/fluentd_types.go
@@ -57,6 +57,7 @@ type FluentdSpec struct {
 	Metrics              *Metrics                    `json:"metrics,omitempty"`
 	Security             *Security                   `json:"security,omitempty"`
 	Scaling              *FluentdScaling             `json:"scaling,omitempty"`
+	Workers              int32                       `json:"workers,omitempty"`
 	// +kubebuilder:validation:enum=fatal,error,warn,info,debug,trace
 	LogLevel             string `json:"logLevel,omitempty"`
 	PodPriorityClassName string `json:"podPriorityClassName,omitempty"`

diff --git a/pkg/sdk/static/gen/crds/generated.go b/pkg/sdk/static/gen/crds/generated.go