From 64b3399f1e43e75662e4839ca9db40ea4d8d1e78 Mon Sep 17 00:00:00 2001
From: Z4ck404 <zakaria.elbazi@netapp.com>
Date: Sat, 25 May 2024 00:31:40 +0200
Subject: [PATCH] [charts/bigdata-proxy] use non-root fluent-bit container
 image

---
 charts/bigdata-proxy/Chart.yaml                |  2 +-
 charts/bigdata-proxy/templates/deployment.yaml | 16 +++++++++-------
 charts/bigdata-proxy/values.yaml               |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/charts/bigdata-proxy/Chart.yaml b/charts/bigdata-proxy/Chart.yaml
index 27a4f6d..a91e4c1 100644
--- a/charts/bigdata-proxy/Chart.yaml
+++ b/charts/bigdata-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-proxy
 description: A Helm chart for the Spot Big Data Proxy
 type: application
-version: 0.4.10
+version: 0.4.11
 appVersion: 0.5.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-proxy/templates/deployment.yaml b/charts/bigdata-proxy/templates/deployment.yaml
index fe81c5f..4534cb9 100644
--- a/charts/bigdata-proxy/templates/deployment.yaml
+++ b/charts/bigdata-proxy/templates/deployment.yaml
@@ -56,6 +56,8 @@ spec:
     {{- if .Values.telemetry.enabled }}
         - name: fluentbit
           image: "{{ .Values.telemetry.fluentbit.image.repository }}:{{ .Values.telemetry.fluentbit.image.tag }}"
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
           ports:
             - name: http
               containerPort: 2020
@@ -84,16 +86,16 @@ spec:
           resources: {}
           volumeMounts:
             - name: telementry-global-config
-              mountPath: /fluent-bit/etc/fluent-bit.conf
+              mountPath: /opt/bitnami/fluent-bit/conf/fluent-bit.conf
               subPath: fluent-bit.conf
-            - name: telementry-global-config
-              mountPath: /fluent-bit/etc/parsers.conf
-              subPath: parsers.conf
             - name: telementry-custom-config
-              mountPath: /fluent-bit/etc/custom-filters.conf
+              mountPath: /opt/bitnami/fluent-bit/conf/custom-filters.conf
               subPath: custom-filters.conf
+            - name: telementry-global-config
+              mountPath: /opt/bitnami/fluent-bit/conf/parsers.conf
+              subPath: parsers.conf
             - name: telementry-custom-config
-              mountPath: /fluent-bit/etc/metrics-collection.conf
+              mountPath: /opt/bitnami/fluent-bit/conf/metrics-collection.conf
               subPath: metrics-collection.conf
             - name: varlog
               readOnly: true
@@ -102,7 +104,7 @@ spec:
               readOnly: true
               mountPath: /var/lib/docker/containers
             - name: telemetry-aws-credentials
-              mountPath: /root/.aws
+              mountPath: /.aws
       volumes:
         - name: telementry-global-config
           configMap:
diff --git a/charts/bigdata-proxy/values.yaml b/charts/bigdata-proxy/values.yaml
index 392680c..3e36eaf 100644
--- a/charts/bigdata-proxy/values.yaml
+++ b/charts/bigdata-proxy/values.yaml
@@ -68,7 +68,7 @@ telemetry:
   fluentbit:
     image:
       repository: public.ecr.aws/ocean-spark/fluent-bit
-      tag: 2.0.10
+      tag: 3.0.5
 
 nodeSelector: {}