Merge pull request #70 from projectsyn/dep/update-helm-minor

Update Helm release fluent-bit to v0.47.5

Author: DebakelOrakel

class/defaults.yml

@@ -1,6 +1,21 @@
 parameters:
   fluentbit:
     namespace: syn-fluentbit
+
+    charts:
+      fluent-bit:
+        source: https://fluent.github.io/helm-charts
+        version: 0.47.5
+
+    images:
+      fluent_bit:
+        image: docker.io/fluent/fluent-bit
+        tag: 3.1.4
+
+    # fluent-bit extra annotations
+    annotations:
+      fluentbit.io/exclude: "true"
+
     configMapName: syn-fluentbit-config
     config:
       # fluent-bit service config
@@ -46,28 +61,22 @@ parameters:
           Keep_Log: "On"
           K8S-Logging.Parser: "On"
           K8S-Logging.Exclude: "On"
-    # fluent-bit extra annotations
-    annotations:
-      fluentbit.io/exclude: "true"
+
+    # Add volumes to the pod spec
+    extraVolumes: []
+    extraVolumeMounts: []
+
     # control PodSecurityPolicy
     psp_enabled: false
+
     # Enable fluent-bit metrics, and configure a ServiceMonitor
     monitoring:
       enabled: false
       metricsPort: 2020
+
     # Add tolerations to the pod spec
     tolerations: []
-    # Add volumes to the pod spec
-    extraVolumes: []
-    extraVolumeMounts: []
-    charts:
-      fluent-bit:
-        source: https://fluent.github.io/helm-charts
-        version: 0.19.23
-    images:
-      fluent_bit:
-        image: docker.io/fluent/fluent-bit
-        tag: 1.9.10
+
     helm_values:
       podAnnotations: ${fluentbit:annotations}
       image:

tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: fluent-bit
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/version: 1.8.15
-    helm.sh/chart: fluent-bit-0.19.23
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
   name: fluent-bit
 rules:
   - apiGroups:

tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: fluent-bit
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/version: 1.8.15
-    helm.sh/chart: fluent-bit-0.19.23
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
   name: fluent-bit
 roleRef:
   apiGroup: rbac.authorization.k8s.io

tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml

@@ -5,9 +5,10 @@ metadata:
     app.kubernetes.io/instance: fluent-bit
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/version: 1.8.15
-    helm.sh/chart: fluent-bit-0.19.23
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
   name: fluent-bit
+  namespace: syn-fluentbit
 spec:
   selector:
     matchLabels:
@@ -17,16 +18,20 @@ spec:
     metadata:
       annotations:
         checksum/config: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-        checksum/luascripts: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
         checksum/syn-config: 06e588437d65a5b9ef0171f6ac0a59e7
         fluentbit.io/exclude: 'true'
       labels:
         app.kubernetes.io/instance: fluent-bit
         app.kubernetes.io/name: fluent-bit
     spec:
       containers:
-        - image: docker.io/fluent/fluent-bit:1.9.10
-          imagePullPolicy: Always
+        - args:
+            - --workdir=/fluent-bit/etc
+            - --config=/fluent-bit/etc/conf/fluent-bit.conf
+          command:
+            - /fluent-bit/bin/fluent-bit
+          image: docker.io/fluent/fluent-bit:3.1.4
+          imagePullPolicy: IfNotPresent
           livenessProbe:
             httpGet:
               path: /
@@ -41,12 +46,8 @@ spec:
               path: /api/v1/health
               port: http
           volumeMounts:
-            - mountPath: /fluent-bit/etc/fluent-bit.conf
+            - mountPath: /fluent-bit/etc/conf
               name: config
-              subPath: fluent-bit.conf
-            - mountPath: /fluent-bit/etc/custom_parsers.conf
-              name: config
-              subPath: custom_parsers.conf
             - mountPath: /var/log
               name: varlog
             - mountPath: /var/lib/docker/containers

tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml

@@ -5,9 +5,10 @@ metadata:
     app.kubernetes.io/instance: fluent-bit
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/version: 1.8.15
-    helm.sh/chart: fluent-bit-0.19.23
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
   name: fluent-bit
+  namespace: syn-fluentbit
 spec:
   ports:
     - name: http

tests/golden/defaults/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml

@@ -5,6 +5,7 @@ metadata:
     app.kubernetes.io/instance: fluent-bit
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/version: 1.8.15
-    helm.sh/chart: fluent-bit-0.19.23
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
   name: fluent-bit
+  namespace: syn-fluentbit

tests/golden/defaults/fluentbit/fluentbit/10_custom_config.yaml

@@ -38,7 +38,7 @@ metadata:
     app.kubernetes.io/instance: fluent-bit-cluster
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/version: 1.9.10
+    app.kubernetes.io/version: 3.1.4
     name: syn-fluentbit-config
   name: syn-fluentbit-config
   namespace: syn-fluentbit