[charts/bigdata-spark-watcher] use non-root fluent-bit container image

spotinst · May 29, 2024 · 44b288e · 44b288e
1 parent 64b3399
commit 44b288e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-spark-watcher
 description: A Helm chart for the Spot Big Data Spark Watcher
 type: application
-version: 0.5.15
+version: 0.5.16
 appVersion: 0.5.0
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

diff --git a/charts/bigdata-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -87,6 +87,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
@@ -127,16 +129,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-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: /fluent-bit/etc/parsers.conf
+              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
@@ -145,7 +147,7 @@ spec:
               readOnly: true
               mountPath: /var/lib/docker/containers
             - name: telemetry-aws-credentials
-              mountPath: /root/.aws
+              mountPath: /.aws
     {{- end }}
       {{- if or .Values.telemetry.enabled .Values.k8sEventLogCollectorEnabled }}
       volumes:

diff --git a/charts/bigdata-spark-watcher/values.yaml b/charts/bigdata-spark-watcher/values.yaml
@@ -90,7 +90,7 @@ telemetry:
   fluentbit:
     image:
       repository: public.ecr.aws/ocean-spark/fluent-bit
-      tag: 2.0.10
+      tag: 3.0.5
 
 nodeSelector: {}