From 8f5784748984f3b355a634b87c8437713536cf31 Mon Sep 17 00:00:00 2001 From: Stephan Feurer Date: Fri, 9 Aug 2024 09:23:28 +0200 Subject: [PATCH] Update Helm release fluent-bit to v0.47.5 --- class/defaults.yml | 37 ++++++++++++------- .../fluent-bit/templates/clusterrole.yaml | 4 +- .../templates/clusterrolebinding.yaml | 4 +- .../fluent-bit/templates/daemonset.yaml | 21 ++++++----- .../fluent-bit/templates/service.yaml | 5 ++- .../fluent-bit/templates/serviceaccount.yaml | 5 ++- .../fluentbit/fluentbit/10_custom_config.yaml | 2 +- 7 files changed, 45 insertions(+), 33 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 5e60d01..f0d26d2 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -1,6 +1,21 @@ parameters: fluentbit: namespace: syn-fluentbit + + charts: + fluent-bit: + source: https://fluent.github.io/helm-charts + version: 0.47.5 + + images: + fluent_bit: + image: docker.io/fluent/fluent-bit + tag: 3.1.4 + + # fluent-bit extra annotations + annotations: + fluentbit.io/exclude: "true" + configMapName: syn-fluentbit-config config: # fluent-bit service config @@ -46,28 +61,22 @@ parameters: Keep_Log: "On" K8S-Logging.Parser: "On" K8S-Logging.Exclude: "On" - # fluent-bit extra annotations - annotations: - fluentbit.io/exclude: "true" + + # Add volumes to the pod spec + extraVolumes: [] + extraVolumeMounts: [] + # control PodSecurityPolicy psp_enabled: false + # Enable fluent-bit metrics, and configure a ServiceMonitor monitoring: enabled: false metricsPort: 2020 + # Add tolerations to the pod spec tolerations: [] - # Add volumes to the pod spec - extraVolumes: [] - extraVolumeMounts: [] - charts: - fluent-bit: - source: https://fluent.github.io/helm-charts - version: 0.19.23 - images: - fluent_bit: - image: docker.io/fluent/fluent-bit - tag: 1.9.10 + helm_values: podAnnotations: ${fluentbit:annotations} image: diff --git a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml index 3f8b0aa..afec30d 100644 --- a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml +++ b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/instance: fluent-bit app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: fluent-bit - app.kubernetes.io/version: 1.8.15 - helm.sh/chart: fluent-bit-0.19.23 + app.kubernetes.io/version: 3.1.4 + helm.sh/chart: fluent-bit-0.47.5 name: fluent-bit rules: - apiGroups: diff --git a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml index ee0efef..09d2315 100644 --- a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml +++ b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/instance: fluent-bit app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: fluent-bit - app.kubernetes.io/version: 1.8.15 - helm.sh/chart: fluent-bit-0.19.23 + app.kubernetes.io/version: 3.1.4 + helm.sh/chart: fluent-bit-0.47.5 name: fluent-bit roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml index 7fd9750..b851e80 100644 --- a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml +++ b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml @@ -5,9 +5,10 @@ metadata: app.kubernetes.io/instance: fluent-bit app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: fluent-bit - app.kubernetes.io/version: 1.8.15 - helm.sh/chart: fluent-bit-0.19.23 + app.kubernetes.io/version: 3.1.4 + helm.sh/chart: fluent-bit-0.47.5 name: fluent-bit + namespace: syn-fluentbit spec: selector: matchLabels: @@ -17,7 +18,6 @@ spec: metadata: annotations: checksum/config: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - checksum/luascripts: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 checksum/syn-config: 06e588437d65a5b9ef0171f6ac0a59e7 fluentbit.io/exclude: 'true' labels: @@ -25,8 +25,13 @@ spec: app.kubernetes.io/name: fluent-bit spec: containers: - - image: docker.io/fluent/fluent-bit:1.9.10 - imagePullPolicy: Always + - args: + - --workdir=/fluent-bit/etc + - --config=/fluent-bit/etc/conf/fluent-bit.conf + command: + - /fluent-bit/bin/fluent-bit + image: docker.io/fluent/fluent-bit:3.1.4 + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: / @@ -41,12 +46,8 @@ spec: path: /api/v1/health port: http volumeMounts: - - mountPath: /fluent-bit/etc/fluent-bit.conf + - mountPath: /fluent-bit/etc/conf name: config - subPath: fluent-bit.conf - - mountPath: /fluent-bit/etc/custom_parsers.conf - name: config - subPath: custom_parsers.conf - mountPath: /var/log name: varlog - mountPath: /var/lib/docker/containers diff --git a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml index 2c1622f..fb8c25e 100644 --- a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml +++ b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml @@ -5,9 +5,10 @@ metadata: app.kubernetes.io/instance: fluent-bit app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: fluent-bit - app.kubernetes.io/version: 1.8.15 - helm.sh/chart: fluent-bit-0.19.23 + app.kubernetes.io/version: 3.1.4 + helm.sh/chart: fluent-bit-0.47.5 name: fluent-bit + namespace: syn-fluentbit spec: ports: - name: http diff --git a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml index e6c936f..d9b88c0 100644 --- a/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml +++ b/tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml @@ -5,6 +5,7 @@ metadata: app.kubernetes.io/instance: fluent-bit app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: fluent-bit - app.kubernetes.io/version: 1.8.15 - helm.sh/chart: fluent-bit-0.19.23 + app.kubernetes.io/version: 3.1.4 + helm.sh/chart: fluent-bit-0.47.5 name: fluent-bit + namespace: syn-fluentbit diff --git a/tests/golden/defaults/fluentbit/fluentbit/10_custom_config.yaml b/tests/golden/defaults/fluentbit/fluentbit/10_custom_config.yaml index b35da5c..31012b1 100644 --- a/tests/golden/defaults/fluentbit/fluentbit/10_custom_config.yaml +++ b/tests/golden/defaults/fluentbit/fluentbit/10_custom_config.yaml @@ -38,7 +38,7 @@ metadata: app.kubernetes.io/instance: fluent-bit-cluster app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: fluent-bit - app.kubernetes.io/version: 1.9.10 + app.kubernetes.io/version: 3.1.4 name: syn-fluentbit-config name: syn-fluentbit-config namespace: syn-fluentbit