added machine-id r/o mount (see: fluent/fluent-bit#497)

sighupio · Jun 5, 2020 · 010207d · 010207d
1 parent 2aec5fb
commit 010207d
Showing 1 changed file with 56 additions and 49 deletions.
diff --git a/katalog/fluentd/fluentbit.yaml b/katalog/fluentd/fluentbit.yaml
@@ -17,59 +17,66 @@ spec:
       tolerations:
         - operator: Exists
       containers:
-      - image: fluent/fluent-bit:1.4.4
-        imagePullPolicy: IfNotPresent
-        name: fluent-bit
-        resources:
-          limits:
-            cpu: 200m
-            memory: 100M
-          requests:
-            cpu: 100m
-            memory: 50M
-        securityContext: {}
-        terminationMessagePath: /dev/termination-log
-        terminationMessagePolicy: File
-        volumeMounts:
-        - mountPath: /var/lib/docker/containers
-          name: varlibcontainers
-          readOnly: true
-        - mountPath: /var/log/
-          name: varlogs
-          readOnly: true
-        - mountPath: /fluent-bit/etc/fluent-bit.conf
-          name: config
-          subPath: fluent-bit.conf
-        - mountPath: /tail-db
-          name: positiondb
-        - mountPath: /buffers
-          name: buffers
+        - image: fluent/fluent-bit:1.4.4
+          imagePullPolicy: IfNotPresent
+          name: fluent-bit
+          resources:
+            limits:
+              cpu: 200m
+              memory: 100M
+            requests:
+              cpu: 100m
+              memory: 50M
+          securityContext: {}
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+          volumeMounts:
+            - mountPath: /var/lib/docker/containers
+              name: varlibcontainers
+              readOnly: true
+            - mountPath: /var/log/
+              name: varlogs
+              readOnly: true
+            - mountPath: /fluent-bit/etc/fluent-bit.conf
+              name: config
+              subPath: fluent-bit.conf
+            - mountPath: /tail-db
+              name: positiondb
+            - mountPath: /buffers
+              name: buffers
+            - mountPath: /etc/machine-id
+              name: etcmachineid
+              readOnly: true
       restartPolicy: Always
       serviceAccountName: fluentd
       terminationGracePeriodSeconds: 30
       volumes:
-      - hostPath:
-          path: /var/lib/docker/containers
-          type: ""
-        name: varlibcontainers
-      - hostPath:
-          path: /var/log
-          type: ""
-        name: varlogs
-      - name: config
-        secret:
-          defaultMode: 420
-          items:
-          - key: fluent-bit.conf
-            path: fluent-bit.conf
-          secretName: fluentbit
-      - hostPath:
-          path: /var/log/fluentbit-pos
-          type: ""
-        name: positiondb
-      - emptyDir: {}
-        name: buffers
+        - hostPath:
+            path: /etc/machine-id
+            type: File
+          name: etcmachineid
+        - hostPath:
+            path: /var/lib/docker/containers
+            type: ""
+          name: varlibcontainers
+        - hostPath:
+            path: /var/log
+            type: ""
+          name: varlogs
+        - name: config
+          secret:
+            defaultMode: 420
+            items:
+              - key: fluent-bit.conf
+                path: fluent-bit.conf
+            secretName: fluentbit
+        - hostPath:
+            path: /var/log/fluentbit-pos
+            type: ""
+          name: positiondb
+        - emptyDir: {}
+          name: buffers
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 1
-    type: RollingUpdate
+    type: RollingUpdate