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

spotinst · May 29, 2024 · 12a52dd · 12a52dd
1 parent 44b288e
commit 12a52dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/charts/spark-operator/Chart.yaml b/charts/spark-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Spark Operator (b/g part)
 name: spark-operator
-version: 0.1.30
+version: 0.1.31
 appVersion: v1beta2-1.3.4-3.1.1
 dependencies:
   - name: spark-operator

diff --git a/charts/spark-operator/charts/spark-operator/templates/deployment.yaml b/charts/spark-operator/charts/spark-operator/templates/deployment.yaml
@@ -137,6 +137,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
@@ -165,16 +167,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
@@ -183,7 +185,7 @@ spec:
             readOnly: true
             mountPath: /var/lib/docker/containers
           - name: telemetry-aws-credentials
-            mountPath: /root/.aws
+            mountPath: /.aws
       {{- end }}
       {{- if or .Values.webhook.enable (ne (len .Values.volumes) 0) .Values.telemetry.enabled }}
       volumes:

diff --git a/charts/spark-operator/values.yaml b/charts/spark-operator/values.yaml
@@ -56,7 +56,7 @@ spark-operator:  # This section controls the behavior of the spark operator sub-
     fluentbit:
       image:
         repository: public.ecr.aws/ocean-spark/fluent-bit
-        tag: 2.0.10
+        tag: 3.0.5
 
   tolerations:
   - key: "bigdata.spot.io/unschedulable"