Removed fluentbit chart dependency, replaced using image

Removed logRetention values, consolidated into fluentbit values
bcgov · Jul 11, 2024 · 945b12e · 945b12e
1 parent 32c6c54
commit 945b12e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/helm/Chart.lock b/helm/Chart.lock
@@ -5,8 +5,5 @@ dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 16.13.2
-- name: fluent-bit
-  repository: https://fluent.github.io/helm-charts
-  version: 0.47.0
-digest: sha256:4fafceb9598c28538e9cc1bb41fc334999ca5bca49d08bfecb9fc6b95bcb0854
-generated: "2024-07-11T14:33:24.034365-07:00"
+digest: sha256:e3cb6ade019f5169d547ac65001758b57bebf2beb6d8e47c4053f4d2e5a6ba06
+generated: "2024-07-11T15:27:57.374585-07:00"
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -32,7 +32,3 @@ dependencies:
     version: 16.13.2
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
-  - name: fluent-bit
-    version: 0.47.0
-    repository: https://fluent.github.io/helm-charts
-    condition: logRetention.enabled
diff --git a/helm/charts/fluent-bit-0.47.0.tgz b/helm/charts/fluent-bit-0.47.0.tgz
diff --git a/helm/templates/deployment-app.yaml b/helm/templates/deployment-app.yaml
@@ -102,7 +102,7 @@ spec:
               mountPath: {{ .mountPath }}
               subPath: {{ .subPath }}
             {{- end }}
-        {{- if .Values.logRetention.enabled }}
+        {{- if .Values.fluentbit.enabled }}
         - name: {{ .Chart.Name }}-fluent-bit
           image: {{ .Values.fluentbit.imageRegistry }}
           imagePullPolicy: {{ .Values.fluentbit.imagePullPolicy }}

diff --git a/helm/templates/log-pvc.yaml b/helm/templates/log-pvc.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.logRetention.enabled -}}
+{{- if .Values.fluentbit.enabled -}}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -11,6 +11,6 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: {{ .Values.logRetention.persistence.size }}
-  storageClassName: {{ .Values.logRetention.persistence.storageClassName }}
+      storage: {{ .Values.fluentbit.persistence.size }}
+  storageClassName: {{ .Values.fluentbit.persistence.storageClassName }}
 {{ end }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -180,8 +180,20 @@ redis:
     containerSecurityContext:
       enabled: false
 
-logRetention:
+fluentbit:
   enabled: true
+  imageRegistry: docker.io/fluent/fluent-bit:latest
+  imagePullPolicy: IfNotPresent
+  securityContext:
+    enabled: false
+    runAsUser: 1001
   persistence:
     size: 1Gi
     storageClassName: netapp-file-backup
+  resources:
+    limits:
+      cpu: 100m
+      memory: 64Mi
+    requests:
+      cpu: 10m
+      memory: 16Mi