Merge branch 'improvement/bump-fluent-bit-0.39.0' into q/127.0

scality · Oct 9, 2023 · 8a6446c · 8a6446c
2 parents d637423 + 9a7472d
commit 8a6446c
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -58,6 +58,12 @@
   [v0.11.1](https://github.com/kubernetes-sigs/prometheus-adapter/releases/tag/v0.11.1)
   (PR[#4174](https://github.com/scality/metalk8s/pull/4174))
 
+- Bump fluent-bit chart version to
+  [0.39.0](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.39.0)
+  The fluent-bit image has been bumped accordingly to
+  [2.1.10](https://github.com/fluent/fluent-bit/releases/tag/v2.1.10)
+  (PR[#4176](https://github.com/scality/metalk8s/pull/4176))
+
 - Bump ingress-nginx chart version to
   [4.8.1](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.8.1)
   The controller image has been bumped accordingly to

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -270,8 +270,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="fluent-bit",
-        version="2.1.7",
-        digest="sha256:78be51c47514817393ed85b37f41960ae74d5b6b84f01298bd87e0b6bda692a1",
+        version="2.1.10",
+        digest="sha256:5766d881ddb1fdacd9c5b24c9f28371ae22d44faaf3f7a510e5e86e37fd6244f",
     ),
 )
 

diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
@@ -1,9 +1,9 @@
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: "Set fluent-bit binary as command"
+    - kind: changed
+      description: "Updated Fluent Bit OCI image to v2.1.10."
 apiVersion: v1
-appVersion: 2.1.7
+appVersion: 2.1.10
 description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD
   family operating systems.
 home: https://fluentbit.io/
@@ -24,4 +24,4 @@ maintainers:
 name: fluent-bit
 sources:
 - https://github.com/fluent/fluent-bit/
-version: 0.36.0
+version: 0.39.0
diff --git a/charts/fluent-bit/templates/clusterrole.yaml b/charts/fluent-bit/templates/clusterrole.yaml
@@ -15,6 +15,9 @@ rules:
       - nodes
       - nodes/proxy
       {{- end }}
+      {{- if .Values.rbac.eventsAccess }}
+      - events
+      {{- end }}
     verbs:
       - get
       - list

diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
@@ -35,6 +35,7 @@ serviceAccount:
 rbac:
   create: true
   nodeAccess: false
+  eventsAccess: false
 
 # Configure podsecuritypolicy
 # Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/

diff --git a/salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls b/salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls
@@ -15,8 +15,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: fluent-bit
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.1.7
-    helm.sh/chart: fluent-bit-0.36.0
+    app.kubernetes.io/version: 2.1.10
+    helm.sh/chart: fluent-bit-0.39.0
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -29,8 +29,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: fluent-bit
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.1.7
-    helm.sh/chart: fluent-bit-0.36.0
+    app.kubernetes.io/version: 2.1.10
+    helm.sh/chart: fluent-bit-0.39.0
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -53,8 +53,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: fluent-bit
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.1.7
-    helm.sh/chart: fluent-bit-0.36.0
+    app.kubernetes.io/version: 2.1.10
+    helm.sh/chart: fluent-bit-0.39.0
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -75,8 +75,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: fluent-bit
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.1.7
-    helm.sh/chart: fluent-bit-0.36.0
+    app.kubernetes.io/version: 2.1.10
+    helm.sh/chart: fluent-bit-0.39.0
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -99,8 +99,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: fluent-bit
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.1.7
-    helm.sh/chart: fluent-bit-0.36.0
+    app.kubernetes.io/version: 2.1.10
+    helm.sh/chart: fluent-bit-0.39.0
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -126,7 +126,7 @@ spec:
         - --config=/fluent-bit/etc/conf/fluent-bit.conf
         command:
         - /fluent-bit/bin/fluent-bit
-        image: {% endraw -%}{{ build_image_name("fluent-bit", False) }}{%- raw %}:2.1.7
+        image: {% endraw -%}{{ build_image_name("fluent-bit", False) }}{%- raw %}:2.1.10
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -191,8 +191,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: fluent-bit
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.1.7
-    helm.sh/chart: fluent-bit-0.36.0
+    app.kubernetes.io/version: 2.1.10
+    helm.sh/chart: fluent-bit-0.39.0
     heritage: metalk8s
     metalk8s.scality.com/monitor: ''
   name: fluent-bit