Merge pull request #25 from kube-logging/release-4.2

Chart release 4.2

.github/workflows/ci.yaml

@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kube: ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25", "1.26"]
+        kube: ["1.22", "1.23", "1.24", "1.25", "1.26", "1.27"]
 
     steps:
       - name: Checkout

.github/workflows/manual.yaml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kube: ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25", "1.26"]
+        kube: ["1.22", "1.23", "1.24", "1.25", "1.26", "1.27"]
 
     steps:
       - name: Checkout

charts/logging-operator-logging/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 type: application
 name: logging-operator-logging
-version: 4.1.0
-kubeVersion: ">=1.16.0-0"
+version: 4.2.0
+kubeVersion: ">=1.22"
 description: A Helm chart to configure logging resource for the Logging operator.
 keywords:
   - logging
@@ -18,14 +18,18 @@ annotations:
       description: Moved to to location
   artifacthub.io/images: |
     - name: fluent-bit
-      image: fluent/fluent-bit:1.9.5
+      image: fluent/fluent-bit:2.1.4
     - name: fluentd
-      image: ghcr.io/kube-logging/fluentd:v1.14
+      image: ghcr.io/kube-logging/fluentd:v1.15-ruby3
     - name: syslog-ng
-      image: ghcr.io/axoflow/syslog-ng:4.1.1
+      image: ghcr.io/axoflow/axosyslog:4.2.0
     - name: logging-operator
-      image: ghcr.io/kube-logging/logging-operator:4.0.0
+      image: ghcr.io/kube-logging/logging-operator:4.2.0
     - name: config-reloader
-      image: ghcr.io/kube-logging/config-reloader:v0.0.2
+      image: ghcr.io/kube-logging/config-reloader:v0.0.5
     - name: node-exporter
-      image: ghcr.io/kube-logging/node-exporter:v0.3.0
+      image: ghcr.io/kube-logging/node-exporter:v0.6.1
+    - name: syslog-ng-exporter
+      image: ghcr.io/kube-logging/syslog-ng-exporter:v0.0.16
+    - name: syslogng-reload
+      image: ghcr.io/kube-logging/syslogng-reload:v1.3.1

charts/logging-operator-logging/README.md

@@ -1,6 +1,6 @@
 # logging-operator-logging
 
-![version: 4.1.0](https://img.shields.io/badge/version-4.1.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square)  ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator--logging-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator-logging)
+![version: 4.2.0](https://img.shields.io/badge/version-4.2.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square)  ![kube version: >=1.22](https://img.shields.io/badge/kube%20version->=1.22-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator--logging-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator-logging)
 
 A Helm chart to configure logging resource for the Logging operator.
 
@@ -27,7 +27,9 @@ helm install --generate-name --wait kube-logging/logging-operator-logging
 | flowConfigCheckDisabled | bool | `false` | Disable configuration check before applying new fluentd configuration. |
 | skipInvalidResources | bool | `false` | Whether to skip invalid Flow and ClusterFlow resources |
 | flowConfigOverride | string | `""` | Override generated config. This is a raw configuration string for troubleshooting purposes. |
+| fluentbitDisabled | bool | `false` | Flag to disable fluentbit completely |
 | fluentbit | object | `{}` | Fluent-bit configurations https://kube-logging.github.io/docs/configuration/crds/v1beta1/fluentbit_types/ |
+| fluentdDisabled | bool | `false` | Flag to disable fluentd completely |
 | fluentd | object | `{}` | Fluentd configurations https://kube-logging.github.io/docs/configuration/crds/v1beta1/fluentd_types/ |
 | syslogNG | object | `{}` | Syslog-NG statefulset configuration |
 | defaultFlow | object | `{}` | Default flow for unmatched logs. This Flow configuration collects all logs that didn’t matched any other Flow. |

charts/logging-operator-logging/templates/logging.yaml

@@ -17,7 +17,7 @@ spec:
   {{- with .Values.flowConfigOverride }}
   flowConfigOverride: {{ . }}
   {{- end }}
-  {{- if or .Values.tls.enabled .Values.fluentbit }}
+  {{- if and (not .Values.fluentbitDisabled) (or .Values.tls.enabled .Values.fluentbit) }}
   fluentbit:
     {{- if .Values.tls.enabled }}
     tls:
@@ -29,7 +29,7 @@ spec:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- end }}
-  {{- if or .Values.tls.enabled .Values.fluentd }}
+  {{- if and (not .Values.fluentdDisabled) (or .Values.tls.enabled .Values.fluentd) }}
   fluentd:
     {{- if .Values.tls.enabled }}
     tls:

charts/logging-operator-logging/values.yaml

@@ -31,9 +31,13 @@ skipInvalidResources: false
 # -- Override generated config. This is a raw configuration string for troubleshooting purposes.
 flowConfigOverride: ""
 
+# -- Flag to disable fluentbit completely
+fluentbitDisabled: false
 # -- Fluent-bit configurations https://kube-logging.github.io/docs/configuration/crds/v1beta1/fluentbit_types/
 fluentbit: {}
 
+# -- Flag to disable fluentd completely
+fluentdDisabled: false
 # -- Fluentd configurations https://kube-logging.github.io/docs/configuration/crds/v1beta1/fluentd_types/
 fluentd: {}
 # 20Gi persistent storage is configured for fluentd by default.

charts/logging-operator/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
 type: application
 name: logging-operator
-version: 4.1.1
-appVersion: 4.1.0
-kubeVersion: ">=1.16.0-0"
+version: 4.2.0
+appVersion: 4.2.0
+kubeVersion: ">=1.22"
 description: Logging operator for Kubernetes based on Fluentd and Fluentbit.
 keywords:
   - logging
@@ -19,4 +19,4 @@ annotations:
       description: Moved to to location
   artifacthub.io/images: |
     - name: logging-operator
-      image: ghcr.io/kube-logging/logging-operator:4.1.0
+      image: ghcr.io/kube-logging/logging-operator:4.2.0

charts/logging-operator/README.md

@@ -1,6 +1,6 @@
 # logging-operator
 
-![version: 4.1.1](https://img.shields.io/badge/version-4.1.1-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 4.1.0](https://img.shields.io/badge/app%20version-4.1.0-informational?style=flat-square) ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator)
+![version: 4.2.0](https://img.shields.io/badge/version-4.2.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 4.2.0](https://img.shields.io/badge/app%20version-4.2.0-informational?style=flat-square) ![kube version: >=1.22](https://img.shields.io/badge/kube%20version->=1.22-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator)
 
 Logging operator for Kubernetes based on Fluentd and Fluentbit.
 

charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml

@@ -967,10 +967,14 @@ spec:
                       type: object
                   type: object
                 type: array
+              flowLabel:
+                type: string
               globalOutputRefs:
                 items:
                   type: string
                 type: array
+              includeLabelInRouter:
+                type: boolean
               loggingRef:
                 type: string
               match:
@@ -1990,10 +1994,14 @@ spec:
                       type: object
                   type: object
                 type: array
+              flowLabel:
+                type: string
               globalOutputRefs:
                 items:
                   type: string
                 type: array
+              includeLabelInRouter:
+                type: boolean
               loggingRef:
                 type: string
               match: