updated kubernetes state

states/kubernetes/defaults.yaml

@@ -10,11 +10,17 @@ kubernetes:
     - ip_vs_wrr
     - ip_vs_sh
     - nf_conntrack
-  sysctls:
+  pkgs:
-    net.ipv4.ip_forward: 1
+    - containerd.io
-    net.ipv6.conf.all.forwarding: 1
+    - cri-tools
-    net.ipv6.conf.all.disable_ipv6: 0
+    - iptables
-    net.core.bpf_jit_enable: 1
+    - helm
+    - kubeadm
+    - kubectl
+    - kubelet
+    - kubernetes-cni
+    - nftables
+    - wireguard-tools
   services:
     - kubelet
     - containerd

states/kubernetes/init.sls

@@ -1,9 +1,9 @@
 ---
 include:
   - repo
+  - sysctl
   - .install
   - .containerd
-  - .sysctl
   - .modules
   - .config
   - .service

states/kubernetes/install.sls

@@ -2,14 +2,4 @@
 {%- from "kubernetes/map.jinja" import kubernetes with context %}
 kubernetes-install-pkgs:
   pkg.installed:
-    - pkgs:
+    - pkgs: {{ kubernetes.pkgs }}
-      - containerd.io
-      - cri-tools
-      - iptables
-      - helm
-      - kubeadm
-      - kubectl
-      - kubelet
-      - kubernetes-cni
-      - nftables
-      - wireguard-tools

states/kubernetes/sysctl.sls

@@ -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"