chore: version bump for fluent*

charts/kubezero-logging/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-logging
 description: KubeZero Umbrella Chart for complete EFK stack
 type: application
-version: 0.7.14
+version: 0.7.15
 appVersion: 1.6.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
@@ -23,9 +23,9 @@ dependencies:
     # repository: https://helm.elastic.co
     condition: eck-operator.enabled
   - name: fluentd
-    version: 0.2.10
+    version: 0.3.0
     condition: fluentd.enabled
   - name: fluent-bit
-    version: 0.19.0
+    version: 0.19.2
     condition: fluent-bit.enabled
 kubeVersion: ">= 1.18.0"

charts/kubezero-logging/README.md

@@ -1,6 +1,6 @@
 # kubezero-logging
 
-![Version: 0.7.13](https://img.shields.io/badge/Version-0.7.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
+![Version: 0.7.15](https://img.shields.io/badge/Version-0.7.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
 
 KubeZero Umbrella Chart for complete EFK stack
 
@@ -19,8 +19,8 @@ Kubernetes: `>= 1.18.0`
 | Repository | Name | Version |
 |------------|------|---------|
 |  | eck-operator | 1.6.0 |
-|  | fluent-bit | 0.17.0 |
+|  | fluent-bit | 0.19.2 |
-|  | fluentd | 0.2.10 |
+|  | fluentd | 0.3.0 |
 | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
 
 ## Changes from upstream
@@ -90,7 +90,7 @@ Kubernetes: `>= 1.18.0`
 | fluent-bit.daemonSetVolumes[1].hostPath.type | string | `"File"` |  |
 | fluent-bit.daemonSetVolumes[1].name | string | `"etcmachineid"` |  |
 | fluent-bit.enabled | bool | `false` |  |
-| fluent-bit.image.tag | string | `"1.8.7"` |  |
+| fluent-bit.image | string | `nil` |  |
 | fluent-bit.luaScripts."kubezero.lua" | string | `"function nest_k8s_ns(tag, timestamp, record)\n    if not record['kubernetes']['namespace_name'] then\n        return 0, 0, 0\n    end\n    new_record = {}\n    for key, val in pairs(record) do\n        if key == 'kube' then\n            new_record[key] = {}\n            new_record[key][record['kubernetes']['namespace_name']] = record[key]\n        else\n            new_record[key] = record[key]\n        end\n    end\n    return 1, timestamp, new_record\nend\n"` |  |
 | fluent-bit.resources.limits.memory | string | `"64Mi"` |  |
 | fluent-bit.resources.requests.cpu | string | `"20m"` |  |

charts/kubezero-logging/charts/fluent-bit/Chart.yaml

@@ -1,11 +1,9 @@
 annotations:
   artifacthub.io/changes: |
-    - kind: added
+    - kind: changed
-      description: "Support setting initContainers to a string value to enable full templating."
+      description: "Update Fluent Bit image to v1.8.9."
-    - kind: removed
-      description: "Don't template initContainers when set to an array."
 apiVersion: v1
-appVersion: 1.8.7
+appVersion: 1.8.9
 description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD
   family operating systems.
 home: https://fluentbit.io/
@@ -24,4 +22,4 @@ maintainers:
 name: fluent-bit
 sources:
 - https://github.com/fluent/fluent-bit/
-version: 0.19.0
+version: 0.19.2

charts/kubezero-logging/charts/fluentd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v1.12.0
 description: A Helm chart for Kubernetes
 home: https://www.fluentd.org/
-icon: https://www.fluentd.org/assets/img/miscellany/fluentd-logo_2x.png
+icon: https://www.fluentd.org/images/miscellany/fluentd-logo_2x.png
 maintainers:
 - email: eduardo@treasure-data.com
   name: edsiper
@@ -12,4 +12,4 @@ name: fluentd
 sources:
 - https://github.com/fluent/fluentd/
 - https://github.com/fluent/fluentd-kubernetes-daemonset
-version: 0.2.10
+version: 0.3.0

charts/kubezero-logging/charts/fluentd/templates/_pod.tpl

@@ -55,6 +55,10 @@ containers:
       {{- print "- name: fluentd-custom-cm-" $key  | nindent 6 }}
         {{- print "mountPath: /etc/fluent/" $key ".d"  | nindent 8 }}
       {{- end }}
+      {{- if .Values.persistence.enabled }}
+      - mountPath: /var/log/fluent
+        name: {{ include "fluentd.fullname" . }}-buffer
+      {{- end }}
 volumes:
   {{- toYaml .Values.volumes | nindent 2 }}
   {{- range $key := .Values.configMapConfigs }}

charts/kubezero-logging/charts/fluentd/templates/statefulset.yaml

@@ -0,0 +1,52 @@
+{{- if eq .Values.kind "StatefulSet" }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "fluentd.fullname" . }}
+  labels:
+    {{- include "fluentd.labels" . | nindent 4 }}
+    {{- with .Values.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  serviceName: {{ include "fluentd.fullname" . }}
+  {{- with .Values.updateStrategy }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "fluentd.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/fluentd-configurations-cm.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "fluentd.selectorLabels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- include "fluentd.pod" . | nindent 6 }}
+  {{- if or .Values.persistence.enabled }}
+  volumeClaimTemplates:
+    {{- if or .Values.persistence.enabled }}
+    - metadata:
+        name: {{ include "fluentd.fullname" . }}-buffer
+      spec:
+        accessModes: [{{ .Values.persistence.accessMode }}]
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size }}
+        storageClassName: {{ .Values.persistence.storageClass }}
+    {{- end }}
+  {{- end }}
+{{- end }}

charts/kubezero-logging/charts/fluentd/values.yaml

@@ -1,10 +1,10 @@
 nameOverride: ""
 fullnameOverride: ""
 
-# DaemonSet or Deployment
+# DaemonSet, Deployment or StatefulSet
 kind: "DaemonSet"
 
-# # Only applicable for Deployment
+# # Only applicable for Deployment or StatefulSet
 # replicaCount: 1
 
 image:
@@ -49,7 +49,7 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
-# Congigure the livessProbe
+# Configure the livessProbe
 # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
 livenessProbe:
   httpGet:
@@ -61,7 +61,7 @@ livenessProbe:
   # successThreshold: 1
   # failureThreshold: 3
 
-# Congigure the readinessProbe
+# Configure the readinessProbe
 # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
 readinessProbe:
   httpGet:
@@ -185,6 +185,15 @@ volumeMounts:
 - name: etcfluentd-config
   mountPath: /etc/fluent/config.d/
 
+## Only available if kind is StatefulSet
+## Fluentd persistence
+##
+persistence:
+  enabled: false
+  storageClass: ""
+  accessMode: ReadWriteOnce
+  size: 10Gi
+
 ## Fluentd service
 ##
 service:

charts/kubezero-logging/values.yaml

@@ -244,7 +244,7 @@ fluent-bit:
 
   image:
     #repository: public.ecr.aws/zero-downtime/fluent-bit
-    tag: 1.8.8
+    #tag: 1.8.9
 
   serviceMonitor:
     enabled: false