Remove unnecessary tolerations from fluent-bit pods (#146)

aws-samples · Jul 25, 2023 · 1013274 · 1013274
1 parent d352a7d
commit 1013274
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 33 deletions.
diff --git a/...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml b/...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml
@@ -55,11 +55,11 @@ data:
         storage.sync              normal
         storage.checksum          off
         storage.backlog.mem_limit 5M
-        
+
     @INCLUDE application-log.conf
     @INCLUDE dataplane-log.conf
     @INCLUDE host-log.conf
-  
+
   application-log.conf: |
     [INPUT]
         Name                tail
@@ -125,15 +125,15 @@ data:
         Name                modify
         Match               application.*
         Rename              Nested.docker_id            Docker.container_id
-    
+
     [FILTER]
         Name                nest
         Match               application.*
         Operation           nest
         Wildcard            Nested.*
         Nested_under        kubernetes
         Remove_prefix       Nested.
-    
+
     [FILTER]
         Name                nest
         Match               application.*
@@ -183,7 +183,7 @@ data:
         log_stream_name     $(tag[2]).$(tag[3])-$(hostname)
         auto_create_group   true
         extra_user_agent    container-insight
-    
+
   host-log.conf: |
     [INPUT]
         Name                tail
@@ -366,11 +366,3 @@ spec:
         hostPath:
           path: /var/log/dmesg
       serviceAccountName: fluent-bit
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      - operator: "Exists"
-        effect: "NoExecute"
-      - operator: "Exists"
-        effect: "NoSchedule"
diff --git a/...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml b/...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml
@@ -57,11 +57,11 @@ data:
         storage.sync              normal
         storage.checksum          off
         storage.backlog.mem_limit 5M
-        
+
     @INCLUDE application-log.conf
     @INCLUDE dataplane-log.conf
     @INCLUDE host-log.conf
-  
+
   application-log.conf: |
     [INPUT]
         Name                tail
@@ -352,11 +352,3 @@ spec:
         hostPath:
           path: /var/log/dmesg
       serviceAccountName: fluent-bit
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      - operator: "Exists"
-        effect: "NoExecute"
-      - operator: "Exists"
-        effect: "NoSchedule"
diff --git a/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml b/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml
@@ -254,11 +254,11 @@ data:
         storage.sync              normal
         storage.checksum          off
         storage.backlog.mem_limit 5M
-        
+
     @INCLUDE application-log.conf
     @INCLUDE dataplane-log.conf
     @INCLUDE host-log.conf
-  
+
   application-log.conf: |
     [INPUT]
         Name                tail
@@ -549,11 +549,3 @@ spec:
         hostPath:
           path: /var/log/dmesg
       serviceAccountName: fluent-bit
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      - operator: "Exists"
-        effect: "NoExecute"
-      - operator: "Exists"
-        effect: "NoSchedule"