Merge branch 'main' into main

vmware · Nov 8, 2024 · 79e9c18 · 79e9c18
2 parents 8d40809 + 377758c
commit 79e9c18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/charts/log-router/templates/daemonset.yaml b/charts/log-router/templates/daemonset.yaml
@@ -143,6 +143,9 @@ spec:
           {{- if .Values.adminNamespace }}
           - --admin-namespace={{ .Values.adminNamespace }}
           {{- end }}
+          {{- if eq .Values.datasource "fs" }}
+          - --fs-dir={{ required "fsDatasourceDir is required for fs datasource" .Values.fsDatasourceDir }}
+          {{- end }}
           volumeMounts:
           - name: fluentconf
             mountPath: /fluentd/etc

diff --git a/charts/log-router/values.yaml b/charts/log-router/values.yaml
@@ -28,6 +28,9 @@ crdMigrationMode: false
 
 defaultConfigmap: "fluentd-config"
 
+# Use with datasource: fs, the fsDataSourceDir will be used for finding config files
+fsDatasourceDir: ""
+
 image:
   repository: vmware/kube-fluentd-operator
   pullPolicy: IfNotPresent