Merge pull request #344 from SanikaGawhane/sg-conntrackd

Disable conntrackd service to reduce CPU utilization
kubernetes-sigs · Aug 26, 2020 · 6595c9d · 6595c9d
2 parents 8ef9f58 + 6401575
commit 6595c9d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/images/capi/ansible/roles/node/defaults/main.yml b/images/capi/ansible/roles/node/defaults/main.yml
@@ -31,7 +31,6 @@ common_rpms:
 common_debs:
 - apt-transport-https
 - conntrack
-- conntrackd
 - curl
 - ebtables
 - jq

diff --git a/images/capi/ansible/roles/node/tasks/main.yml b/images/capi/ansible/roles/node/tasks/main.yml
@@ -59,3 +59,10 @@
 - name: Edit fstab file to disable swap
   shell: sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab
   when: ansible_memory_mb.swap.total != 0
+
+- name: Disable conntrackd service
+  systemd:
+    name: conntrackd
+    state: stopped
+    enabled: false
+  when: ansible_os_family != "Debian"
diff --git a/images/capi/packer/goss/goss-service.yaml b/images/capi/packer/goss/goss-service.yaml
@@ -8,6 +8,9 @@ service:
   kubelet:
     enabled: true
     running: false
+  conntrackd:
+    enabled: false
+    running: false
 {{range $name, $vers := index .Vars .Vars.OS "common-service"}}
   {{ $name }}:
   {{range $key, $val := $vers}}

diff --git a/images/capi/packer/goss/goss-vars.yaml b/images/capi/packer/goss/goss-vars.yaml
@@ -15,7 +15,6 @@ common_rpms: &common_rpms
 common_debs: &common_debs
   apt-transport-https:
   conntrack:
-  conntrackd:
   curl:
   ebtables:
   jq: