diff --git a/states/kubernetes/defaults.yaml b/states/kubernetes/defaults.yaml index 5bbf83c..88ce3d5 100644 --- a/states/kubernetes/defaults.yaml +++ b/states/kubernetes/defaults.yaml @@ -10,11 +10,17 @@ kubernetes: - ip_vs_wrr - ip_vs_sh - nf_conntrack - sysctls: - net.ipv4.ip_forward: 1 - net.ipv6.conf.all.forwarding: 1 - net.ipv6.conf.all.disable_ipv6: 0 - net.core.bpf_jit_enable: 1 + pkgs: + - containerd.io + - cri-tools + - iptables + - helm + - kubeadm + - kubectl + - kubelet + - kubernetes-cni + - nftables + - wireguard-tools services: - kubelet - containerd diff --git a/states/kubernetes/init.sls b/states/kubernetes/init.sls index 353c51b..393d92b 100644 --- a/states/kubernetes/init.sls +++ b/states/kubernetes/init.sls @@ -1,9 +1,9 @@ --- include: - repo + - sysctl - .install - .containerd - - .sysctl - .modules - .config - .service diff --git a/states/kubernetes/install.sls b/states/kubernetes/install.sls index 952da3a..8369d3f 100644 --- a/states/kubernetes/install.sls +++ b/states/kubernetes/install.sls @@ -2,14 +2,4 @@ {%- from "kubernetes/map.jinja" import kubernetes with context %} kubernetes-install-pkgs: pkg.installed: - - pkgs: - - containerd.io - - cri-tools - - iptables - - helm - - kubeadm - - kubectl - - kubelet - - kubernetes-cni - - nftables - - wireguard-tools + - pkgs: {{ kubernetes.pkgs }} diff --git a/states/kubernetes/sysctl.sls b/states/kubernetes/sysctl.sls deleted file mode 100644 index b2d7377..0000000 --- a/states/kubernetes/sysctl.sls +++ /dev/null @@ -1,17 +0,0 @@ ---- -{%- from "kubernetes/map.jinja" import kubernetes with context %} -kubernetes-sysctls: - file.keyvalue: - - name: /etc/sysctl.conf - - key_values: -{%- for k,v in kubernetes.sysctls.items() %} - {{ k }}: {{ v }} -{%- endfor %} - - separator: '=' - - uncomment: '# ' - - key_ignore_case: True - - append_if_not_found: True - -kubernetes-sysctl-command: - cmd.run: - - name: "sysctl --system"