Update fluent-operator from v2.2.0 to v2.3.0 (#378)

* Update fluent-operator from v2.2.0 to v2.3.0 Signed-off-by: flxman <felix.farjsjo@gmail.com> * Fix lint Signed-off-by: flxman <felix.farjsjo@gmail.com> Signed-off-by: flxman <felix.farjsjo@gmail.com> --------- Signed-off-by: flxman <felix.farjsjo@gmail.com>
fluent · Jun 12, 2023 · 4e502ac · 4e502ac
1 parent 6e4c3ca
commit 4e502ac
Show file tree

Hide file tree

Showing 21 changed files with 1,293 additions and 24 deletions.
diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml
@@ -6,8 +6,8 @@ keywords:
   - fluent-bit
   - fluentd
   - operator
-version: 2.2.0
-appVersion: 2.2.0
+version: 2.3.0
+appVersion: 2.3.0
 icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
 home: https://www.fluentd.org/
 sources:

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusterfilters.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusterfilters.yaml
@@ -703,6 +703,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -287,6 +287,7 @@ spec:
                   logLevel:
                     description: Diagnostic level (error/warning/info/debug/trace)
                     enum:
+                    - "off"
                     - error
                     - warning
                     - info

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml
@@ -80,6 +80,15 @@ spec:
                   tag:
                     type: string
                 type: object
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               nodeExporterMetrics:
                 description: NodeExporterMetrics defines Node Exporter Metrics Input
                   configuration.

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml
diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_filters.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_filters.yaml
@@ -703,6 +703,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_fluentbits.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_fluentbits.yaml
@@ -4302,6 +4302,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluent-bit
+                  pods.
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_outputs.yaml
diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_clusterfilters.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_clusterfilters.yaml
@@ -427,6 +427,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object

diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_clusteroutputs.yaml
@@ -1618,6 +1618,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object

diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_filters.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_filters.yaml
@@ -427,6 +427,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object

diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_fluentds.yaml
diff --git a/charts/fluent-operator/crds/fluentd.fluent.io_outputs.yaml b/charts/fluent-operator/crds/fluentd.fluent.io_outputs.yaml
@@ -1618,6 +1618,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object

diff --git a/charts/fluent-operator/templates/fluent-operator-deployment.yaml b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
@@ -95,7 +95,22 @@ spec:
         - name: env
           mountPath: /fluent-operator
       serviceAccountName: fluent-operator
+      {{- if .Values.operator.priorityClassName }}
+      priorityClassName: {{ .Values.operator.priorityClassName | quote }}
+      {{- end }}
       {{- if .Values.operator.imagePullSecrets }}
       imagePullSecrets:
-      {{- toYaml .Values.operator.imagePullSecrets | nindent 8 }}
+        {{ toYaml .Values.operator.imagePullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.operator.tolerations }}
+      tolerations:
+        {{ toYaml .Values.operator.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.operator.nodeSelector }}
+      nodeSelector:
+        {{ toYaml .Values.operator.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.operator.podSecurityContext }}
+      podSecurityContext:
+        {{ toYaml .Values.operator.podSecurityContext | nindent 8 }}
       {{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
@@ -12,6 +12,7 @@ spec:
   tail:
     tag: kube.*
     path: {{ .Values.fluentbit.input.tail.path }}
+    readFromHead: {{ .Values.fluentbit.input.tail.readFromHead }}
     {{- if eq .Values.containerRuntime "docker" }}
     parser: docker
     {{- else if eq .Values.containerRuntime "containerd" }}

diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -18,15 +18,32 @@ spec:
   resources:
 {{- toYaml .Values.fluentbit.resources | nindent 4  }}
   fluentBitConfigName: fluent-bit-config
+  {{- if .Values.fluentbit.namespaceFluentBitCfgSelector }}
+  namespaceFluentBitCfgSelector:
+{{ toYaml .Values.fluentbit.namespaceFluentBitCfgSelector | indent 4  }}
+  {{- end }}
+{{- if .Values.fluentbit.envVars }}
+  envVars:
+{{ toYaml .Values.fluentbit.envVars | indent 4 }}
+{{- end }}
+{{- with .Values.fluentbit.tolerations }}
   tolerations:
-    - operator: Exists
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.fluentbit.nodeSelector }}
+  nodeSelector:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if .Values.fluentbit.priorityClassName }}
+  priorityClassName: {{ .Values.fluentbit.priorityClassName | quote }}
+{{- end }}
+  {{- with .Values.fluentbit.affinity }}
   affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: node-role.kubernetes.io/edge
-                operator: DoesNotExist
+{{ toYaml . | indent 4 }}
+  {{- end }}
+  {{- if .Values.fluentbit.schedulerName }}
+  schedulerName: {{ .Values.fluentbit.schedulerName }}
+  {{- end }}
   {{- if .Values.fluentbit.secrets }}
   secrets:
 {{ toYaml .Values.fluentbit.secrets | indent 4 }}
@@ -53,4 +70,4 @@ spec:
 {{ toYaml .Values.fluentbit.labels | indent 4 }}
   {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-input-node-exporter-metrics-edge.yaml b/charts/fluent-operator/templates/fluentbit-input-node-exporter-metrics-edge.yaml
@@ -8,8 +8,8 @@ metadata:
     node-role.kubernetes.io/edge: "true"
 spec:
   nodeExporterMetrics:
-    tag: kubeedge.*
-    scrapeInterval: 30s
+    tag: kubeedge.metrics.*
+    scrapeInterval: 1m
     path :
         procfs: /host/proc
         sysfs : /host/sys

diff --git a/charts/fluent-operator/templates/fluentbit-input-prometheus-scrape-metrics-edge.yaml b/charts/fluent-operator/templates/fluentbit-input-prometheus-scrape-metrics-edge.yaml
@@ -8,9 +8,9 @@ metadata:
     node-role.kubernetes.io/edge: "true"
 spec:
   prometheusScrapeMetrics:
-    tag: kubeedge.*
+    tag: kubeedge.metrics.*
     host: 127.0.0.1
     port: 10350
-    scrapeInterval: 30s
+    scrapeInterval: 1m
     metricsPath : /metrics/cadvisor 
 {{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-output-prometheus-remote-write-edge.yaml b/charts/fluent-operator/templates/fluentbit-output-prometheus-remote-write-edge.yaml
@@ -7,7 +7,7 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     node-role.kubernetes.io/edge: "true"
 spec:
-  matchRegex: (?:kubeedge|service)\.(.*)
+  match: kubeedge.metrics.*
   prometheusRemoteWrite:
     host: {{ .Values.fluentbit.edge.prometheusRemoteWrite.host }}
     port: {{ .Values.fluentbit.edge.prometheusRemoteWrite.port }}

diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -18,5 +18,11 @@ spec:
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
+  {{- if .Values.fluentd.schedulerName }}
+  schedulerName: {{ .Values.fluentd.schedulerName }}
+  {{- end }}
+  {{- if .Values.fluentd.logLevel }}
+  logLevel: {{ .Values.fluentd.logLevel }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -16,8 +16,16 @@ operator:
     tag: "20.10"
   container:
     repository: "kubesphere/fluent-operator"
-    tag: "v2.2.0"
-    # FluentBit operator resources. Usually user needn't to adjust these.
+    tag: "v2.3.0"
+  # nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+  # Node tolerations applied to Fluent Operator. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  tolerations: []
+  # Priority class applied to Fluent Operator. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
+  priorityClassName: ""
+  # Pod security context for Fluent Operator. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  podSecurityContext: {}
+  # Fluent Operator resources. Usually user needn't to adjust these.
   resources:
     limits:
       cpu: 100m
@@ -53,7 +61,7 @@ fluentbit:
   enable: true
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.0.11"
+    tag: "v2.1.4"
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:
@@ -83,6 +91,26 @@ fluentbit:
   additionalVolumes: []
   # Pod volumes to mount into the container's filesystem.
   additionalVolumesMounts: []
+  # affinity configuration for Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: node-role.kubernetes.io/edge
+                operator: DoesNotExist
+  # nodeSelector configuration for Fluent Bit pods. Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+  # Node tolerations applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  tolerations:
+  - operator: Exists
+  # Priority Class applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
+  priorityClassName: ""
+  # Environment variables that can be passed to fluentbit pods
+  envVars: []
+  #  - name: FOO
+  #    value: "bar"
+  schedulerName: ""
 
   # Remove the above empty volumes and volumesMounts, and then set additionalVolumes and additionalVolumesMounts as below if you want to collect node exporter metrics
   # additionalVolumes:
@@ -102,6 +130,8 @@ fluentbit:
   #     name: hostProc
   #     readOnly: true
 
+  namespaceFluentBitCfgSelector: {}
+
   # Set a limit of memory that Tail plugin can use when appending data to the Engine.
   # You can find more details here: https://docs.fluentbit.io/manual/pipeline/inputs/tail#config
   # If the limit is reach, it will be paused; when the data is flushed it resumes.
@@ -115,6 +145,7 @@ fluentbit:
       memBufLimit: 5MB
       path: "/var/log/containers/*.log"
       skipLongLines: true
+      readFromHead: false
     systemd:
       enable: true
       path: "/var/log/journal"
@@ -131,7 +162,7 @@ fluentbit:
   # Configure the output plugin parameter in FluentBit.
   # You can set enable to true to output logs to the specified location.
   output:
-    #  You can find more supported output plugins here: https://github.com/fluent/fluent-operator/tree/master/docs/plugins/fluentbit/clusteroutput
+    #  You can find more supported output plugins here: https://github.com/fluent/fluent-operator/tree/master/docs/plugins/fluentbit/output
     es:
       enable: false
       host: "<Elasticsearch url like elasticsearch-logging-data.kubesphere-logging-system.svc>"
@@ -210,6 +241,8 @@ fluentd:
     requests:
       cpu: 100m
       memory: 128Mi
+  schedulerName: ""
+  logLevel: ""
   # Configure the output plugin parameter in Fluentd.
   # Fluentd is disabled by default, if you enable it make sure to also set up an output to use.
   output: