Added extra args to logging fluentd and pass it to config check

kube-logging · Jul 20, 2022 · 5d5e282 · 5d5e282
1 parent 6f1e3e6
commit 5d5e282
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -3687,6 +3687,10 @@ spec:
                       - name
                       type: object
                     type: array
+                  extraArgs:
+                    items:
+                      type: string
+                    type: array
                   extraVolumes:
                     items:
                       properties:

diff --git a/config/crd/bases/logging.banzaicloud.io_loggings.yaml b/config/crd/bases/logging.banzaicloud.io_loggings.yaml
@@ -3687,6 +3687,10 @@ spec:
                       - name
                       type: object
                     type: array
+                  extraArgs:
+                    items:
+                      type: string
+                    type: array
                   extraVolumes:
                     items:
                       properties:

diff --git a/pkg/resources/fluentd/appconfigmap.go b/pkg/resources/fluentd/appconfigmap.go
@@ -208,6 +208,16 @@ func (r *Reconciler) newCheckOutputSecret(hashKey string) (*corev1.Secret, error
 }
 
 func (r *Reconciler) newCheckPod(hashKey string) *corev1.Pod {
+	containerArgs := []string{
+		"fluentd", "-c",
+		fmt.Sprintf("/fluentd/etc/%s", ConfigKey),
+		"--dry-run",
+	}
+
+	if len(r.Logging.Spec.FluentdSpec.ExtraArgs) != 0 {
+		containerArgs = append(containerArgs, r.Logging.Spec.FluentdSpec.ExtraArgs...)
+	}
+
 	pod := &corev1.Pod{
 		ObjectMeta: r.FluentdObjectMeta(fmt.Sprintf("fluentd-configcheck-%s", hashKey), ComponentConfigCheck),
 		Spec: corev1.PodSpec{
@@ -247,11 +257,8 @@ func (r *Reconciler) newCheckPod(hashKey string) *corev1.Pod {
 					Name:            "fluentd",
 					Image:           r.Logging.Spec.FluentdSpec.Image.RepositoryWithTag(),
 					ImagePullPolicy: corev1.PullPolicy(r.Logging.Spec.FluentdSpec.Image.PullPolicy),
-					Args: []string{
-						"fluentd", "-c",
-						fmt.Sprintf("/fluentd/etc/%s", ConfigKey),
-						"--dry-run",
-					},
+					Args:            containerArgs,
+					Env:             r.Logging.Spec.FluentdSpec.EnvVars,
 					VolumeMounts: []corev1.VolumeMount{
 						{
 							Name:      "config",

diff --git a/pkg/resources/fluentd/statefulset.go b/pkg/resources/fluentd/statefulset.go
@@ -149,6 +149,10 @@ func fluentContainer(spec *v1beta1.FluentdSpec) corev1.Container {
 		}
 	}
 
+	if len(spec.ExtraArgs) != 0 {
+		container.Args = append(container.Args, spec.ExtraArgs...)
+	}
+
 	return container
 }
 

diff --git a/pkg/sdk/logging/api/v1beta1/fluentd_types.go b/pkg/sdk/logging/api/v1beta1/fluentd_types.go
@@ -91,6 +91,7 @@ type FluentdSpec struct {
 	ServiceAccountOverrides *typeoverride.ServiceAccount `json:"serviceAccount,omitempty"`
 	DNSPolicy               corev1.DNSPolicy             `json:"dnsPolicy,omitempty"`
 	DNSConfig               *corev1.PodDNSConfig         `json:"dnsConfig,omitempty"`
+	ExtraArgs               []string                     `json:"extraArgs,omitempty"`
 }
 
 // +kubebuilder:object:generate=true

diff --git a/pkg/sdk/logging/api/v1beta1/zz_generated.deepcopy.go b/pkg/sdk/logging/api/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/sdk/static/gen/crds/generated.go b/pkg/sdk/static/gen/crds/generated.go