Merge branch 'improvement/ARTESCA-15780-bump-fluent-bit-chart-403' into q/131.0

Author: bert-e

CHANGELOG.md

@@ -11,6 +11,10 @@
 - Add DNS troubleshooting outputs to `sosreport` plugin
   (PR[#4621](https://github.com/scality/metalk8s/pull/4621))
 
+- Bump Fluent Bit image version to [4.0.3](https://github.com/fluent/fluent-bit/releases/tag/v4.0.3)
+  and Fluent Bit Helm chart version to [0.50.0](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.50.0)
+  (PR[#4627](https://github.com/scality/metalk8s/pull/4627))
+
 ## Release 130.0.4 (in development)
 
 ## Release 130.0.3

buildchain/buildchain/versions.py

@@ -278,8 +278,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="fluent-bit",
-        version="3.2.8",
-        digest="sha256:14da4a52ecdbb9bd9cb7a16ff6b4c7f391a4006cb13f84b5957e4608cc613e2c",
+        version="4.0.3",
+        digest="sha256:d6cc0a0a45a4fc61acde53939ed91672ed6fada7bb87710976309c0831232a79",
     ),
     Image(
         name="cert-manager-controller",

charts/fluent-bit/Chart.yaml

@@ -1,9 +1,9 @@
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: "Updated Fluent Bit OCI image to v3.2.8."
+    - kind: added
+      description: "Add VPA controlledValues option"
 apiVersion: v1
-appVersion: 3.2.8
+appVersion: 4.0.3
 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.48.9
+version: 0.50.0

charts/fluent-bit/templates/service.yaml

@@ -33,6 +33,9 @@ spec:
   loadBalancerSourceRanges:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- with .Values.service.loadBalancerIP}}
+  loadBalancerIP: {{ . }}
+  {{- end }}
   {{- end }}
   ports:
     - port: {{ .Values.service.port }}

charts/fluent-bit/templates/vpa.yaml

@@ -15,7 +15,11 @@ spec:
     containerPolicies:
     - containerName: {{ .Chart.Name }}
       {{- with .Values.autoscaling.vpa.controlledResources }}
-      controlledResources: 
+      controlledResources:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.autoscaling.vpa.controlledValues }}
+      controlledValues:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.autoscaling.vpa.maxAllowed }}

charts/fluent-bit/values.yaml

@@ -103,6 +103,7 @@ service:
   internalTrafficPolicy:
   loadBalancerClass:
   loadBalancerSourceRanges: []
+  loadBalancerIP:
   labels: {}
   # nodePort: 30020
   # clusterIP: 172.16.10.1
@@ -243,6 +244,9 @@ autoscaling:
     # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory
     controlledResources: []
 
+    # Values that the vertical pod autoscaler can control. Allowed values are RequestsAndLimits and RequestsOnly. Default is RequestsAndLimits.
+    controlledValues:
+
     # Define the max allowed resources for the pod
     maxAllowed: {}
     # cpu: 200m

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: 3.2.8
-    helm.sh/chart: fluent-bit-0.48.9
+    app.kubernetes.io/version: 4.0.3
+    helm.sh/chart: fluent-bit-0.50.0
     heritage: metalk8s
   name: fluent-bit
   namespace: metalk8s-logging
@@ -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: 3.2.8
+    app.kubernetes.io/version: 4.0.3
     grafana_dashboard: '1'
-    helm.sh/chart: fluent-bit-0.48.9
+    helm.sh/chart: fluent-bit-0.50.0
     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: 3.2.8
-    helm.sh/chart: fluent-bit-0.48.9
+    app.kubernetes.io/version: 4.0.3
+    helm.sh/chart: fluent-bit-0.50.0
     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: 3.2.8
-    helm.sh/chart: fluent-bit-0.48.9
+    app.kubernetes.io/version: 4.0.3
+    helm.sh/chart: fluent-bit-0.50.0
     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: 3.2.8
-    helm.sh/chart: fluent-bit-0.48.9
+    app.kubernetes.io/version: 4.0.3
+    helm.sh/chart: fluent-bit-0.50.0
     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: 3.2.8
-    helm.sh/chart: fluent-bit-0.48.9
+    app.kubernetes.io/version: 4.0.3
+    helm.sh/chart: fluent-bit-0.50.0
     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 %}:3.2.8
+        image: {% endraw -%}{{ build_image_name("fluent-bit", False) }}{%- raw %}:4.0.3
         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: 3.2.8
-    helm.sh/chart: fluent-bit-0.48.9
+    app.kubernetes.io/version: 4.0.3
+    helm.sh/chart: fluent-bit-0.50.0
     heritage: metalk8s
     metalk8s.scality.com/monitor: ''
   name: fluent-bit