build: bump fluent-bit chart to 0.47.9

scality · Sep 5, 2024 · 1399eb8 · 1399eb8
1 parent 75e6679
commit 1399eb8
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,12 @@
 - Bump CoreDNS version to [v1.11.1](https://github.com/coredns/coredns/releases/tag/v1.11.1)
   (PR[#4369](https://github.com/scality/metalk8s/pull/4369))
 
+- Bump fluent-bit chart version to
+  [0.47.9](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.47.9)
+  The fluent-bit image has been bumped accordingly to
+  [3.1.7](https://github.com/fluent/fluent-bit/releases/tag/v3.1.7)
+  (PR[#4415](https://github.com/scality/metalk8s/pull/4415))
+  
 - Bump Loki chart version to
   [5.48.0](https://github.com/grafana/loki/releases/tag/helm-loki-5.48.0)
   (PR[#4401](https://github.com/scality/metalk8s/pull/4401))
@@ -63,18 +69,6 @@
   [v2.40.0](https://github.com/dexidp/dex/releases/tag/v2.40.0)
   (PR[#4367](https://github.com/scality/metalk8s/pull/4367))
 
-- Bump Loki chart version to
-  [5.47.1](https://github.com/grafana/loki/releases/tag/helm-loki-5.47.1)
-  The Loki image has been bumped accordingly to
-  [2.9.6](https://github.com/grafana/loki/releases/tag/v2.9.6)
-  (PR[#4285](https://github.com/scality/metalk8s/pull/4285))
-
-- Bump fluent-bit chart version to
-  [0.44.0](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.44.0)
-  The fluent-bit image has been bumped accordingly to
-  [2.2.2](https://github.com/fluent/fluent-bit/releases/tag/v2.2.2)
-  (PR[#4286](https://github.com/scality/metalk8s/pull/4286))
-
 - Bump ingress-nginx chart version to
   [4.10.0](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.10.0)
   The controller image has been bumped accordingly to

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -268,8 +268,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="fluent-bit",
-        version="2.2.2",
-        digest="sha256:bc89a87cc9cd40c320644835b83170f49819dc3ea447e38c71dde27a181e7a9b",
+        version="3.1.7",
+        digest="a93d6119f67f804843f6d4d97dd8448389abed7e821e7513c5b8f387e57edfb9",
     ),
 )
 

diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
@@ -1,9 +1,9 @@
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: "Added local internalTrafficPolicy for daemonsets"
+      description: "Made fluent-bit grafana dashboard uid configurable"
 apiVersion: v1
-appVersion: 2.2.2
+appVersion: 3.1.7
 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.44.0
+version: 0.47.9
diff --git a/charts/fluent-bit/ci/ci-values.yaml b/charts/fluent-bit/ci/ci-values.yaml
@@ -5,3 +5,4 @@ logLevel: debug
 
 dashboards:
   enabled: true
+  deterministicUid: true
diff --git a/charts/fluent-bit/dashboards/fluent-bit.json b/charts/fluent-bit/dashboards/fluent-bit.json
@@ -1559,7 +1559,7 @@
   },
   "timezone": "",
   "title": "{{ include "fluent-bit.fullname" . }}",
-  "uid": "d557c8f6-cac1-445f-8ade-4c351a9076b1",
+  "uid": {{ ternary (printf "\"%s\"" (sha1sum (printf "%s-%s" .Release.Namespace (include "fluent-bit.fullname" .)))) "null" .Values.dashboards.deterministicUid }},
   "version": 7,
   "weekStart": ""
-}
+}
diff --git a/charts/fluent-bit/templates/_pod.tpl b/charts/fluent-bit/templates/_pod.tpl
@@ -119,7 +119,11 @@ containers:
     {{- end }}
 {{- end }}
 {{- if .Values.extraContainers }}
-  {{- toYaml .Values.extraContainers | nindent 2 }}
+  {{- if kindIs "string" .Values.extraContainers }}
+    {{- tpl .Values.extraContainers $ | nindent 2 }}
+  {{- else }}
+    {{-  toYaml .Values.extraContainers | nindent 2 }}
+  {{- end -}}
 {{- end }}
 volumes:
   - name: config

diff --git a/charts/fluent-bit/templates/clusterrole.yaml b/charts/fluent-bit/templates/clusterrole.yaml
@@ -13,6 +13,7 @@ rules:
       - pods
       {{- if .Values.rbac.nodeAccess }}
       - nodes
+      - nodes/metrics
       - nodes/proxy
       {{- end }}
       {{- if .Values.rbac.eventsAccess }}

diff --git a/charts/fluent-bit/templates/ingress.yaml b/charts/fluent-bit/templates/ingress.yaml
@@ -14,7 +14,9 @@ metadata:
     {{- include "fluent-bit.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+  {{- range $key, $value := . }}
+    {{ printf "%s: %s" $key ((tpl $value $) | quote) }}
+  {{- end }}
   {{- end }}
 spec:
   {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }}

diff --git a/charts/fluent-bit/templates/service.yaml b/charts/fluent-bit/templates/service.yaml
@@ -17,6 +17,9 @@ spec:
   {{- if and (eq .Values.service.type "ClusterIP") (.Values.service.clusterIP) }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
+  {{- if .Values.service.externalIPs }}
+  externalIPs: {{- toYaml .Values.service.externalIPs | nindent 4 }}
+  {{- end }}
   {{- if (eq .Values.kind "DaemonSet") }}
   {{- with .Values.service.internalTrafficPolicy }}
   internalTrafficPolicy: {{ . }}

diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
@@ -12,7 +12,7 @@ image:
   # Set to "-" to not use the default value
   tag:
   digest:
-  pullPolicy: Always
+  pullPolicy: IfNotPresent
 
 testFramework:
   enabled: true
@@ -101,6 +101,10 @@ service:
 #   prometheus.io/path: "/api/v1/metrics/prometheus"
 #   prometheus.io/port: "2020"
 #   prometheus.io/scrape: "true"
+  externalIPs: []
+  # externalIPs:
+  #  - 2.2.2.2
+
 
 serviceMonitor:
   enabled: false
@@ -178,6 +182,7 @@ dashboards:
   labelValue: 1
   annotations: {}
   namespace: ""
+  deterministicUid: false
 
 lifecycle: {}
 #   preStop:
@@ -314,11 +319,21 @@ envWithTpl: []
 
 envFrom: []
 
+# This supports either a structured array or a templatable string
 extraContainers: []
+
+# Array mode
+# extraContainers:
 #   - name: do-something
 #     image: busybox
 #     command: ['do', 'something']
 
+# String mode
+# extraContainers: |-
+#   - name: do-something
+#     image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}
+#     command: ['kubectl', 'version']
+
 flush: 1
 
 metricsPort: 2020

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.2.2
-    helm.sh/chart: fluent-bit-0.44.0
+    app.kubernetes.io/version: 3.1.7
+    helm.sh/chart: fluent-bit-0.47.9
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -1585,7 +1585,7 @@ data:
       },
       "timezone": "",
       "title": "fluent-bit",
-      "uid": "d557c8f6-cac1-445f-8ade-4c351a9076b1",
+      "uid": null,
       "version": 7,
       "weekStart": ""
     }
@@ -1596,9 +1596,9 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: fluent-bit
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.2.2
+    app.kubernetes.io/version: 3.1.7
     grafana_dashboard: '1'
-    helm.sh/chart: fluent-bit-0.44.0
+    helm.sh/chart: fluent-bit-0.47.9
     heritage: metalk8s
   name: fluent-bit-dashboard-fluent-bit
   namespace: metalk8s-logging
@@ -1611,8 +1611,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.2.2
-    helm.sh/chart: fluent-bit-0.44.0
+    app.kubernetes.io/version: 3.1.7
+    helm.sh/chart: fluent-bit-0.47.9
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -1635,8 +1635,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.2.2
-    helm.sh/chart: fluent-bit-0.44.0
+    app.kubernetes.io/version: 3.1.7
+    helm.sh/chart: fluent-bit-0.47.9
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -1657,8 +1657,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.2.2
-    helm.sh/chart: fluent-bit-0.44.0
+    app.kubernetes.io/version: 3.1.7
+    helm.sh/chart: fluent-bit-0.47.9
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -1681,8 +1681,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.2.2
-    helm.sh/chart: fluent-bit-0.44.0
+    app.kubernetes.io/version: 3.1.7
+    helm.sh/chart: fluent-bit-0.47.9
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -1708,7 +1708,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.2.2
+        image: {% endraw -%}{{ build_image_name("fluent-bit", False) }}{%- raw %}:3.1.7
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -1773,8 +1773,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.2.2
-    helm.sh/chart: fluent-bit-0.44.0
+    app.kubernetes.io/version: 3.1.7
+    helm.sh/chart: fluent-bit-0.47.9
     heritage: metalk8s
     metalk8s.scality.com/monitor: ''
   name: fluent-bit