cleaning, add ipvs and fixed some litle bug

templates/kubeadm-config.yaml.j2

@@ -9,6 +9,8 @@ bootstrapTokens:
 nodeRegistration:
 {% if  kubernetes_cri == "containerd" %}
   criSocket: "/run/containerd/containerd.sock"
+{% elif kubernetes_cri == "cri-o" %}
+  criSocket: "/var/run/crio/crio.sock"
 {% elif  kubernetes_cri == "docker" %}
   criSocket: "/var/run/docker.sock"
 {% endif %}
@@ -20,13 +22,15 @@ nodeRegistration:
     effect: "NoSchedule"
 {% endif %}
   kubeletExtraArgs:
-{% if  kubernetes_cri == "containerd" %}
     cgroup-driver: "systemd"
     container-runtime: "remote"
-    runtime-request-timeout: "15m"
+    runtime-request-timeout: "5m"
+{% if kubernetes_cri == "containerd" %}
     container-runtime-endpoint: "unix:///run/containerd/containerd.sock"
+{% elif kubernetes_cri == "cri-o" %}
+    container-runtime-endpoint: "unix:///var/run/crio/crio.sock"
 {% endif %}
-    node-ip: {{ ansible_host }}
+    node-ip: {{ ansible_default_ipv4.address }}
     read-only-port: "10255"
   ignorePreflightErrors:
   - SystemVerification
@@ -34,7 +38,7 @@ nodeRegistration:
   - IsPrivilegedUser
 {% endif %}
 localAPIEndpoint:
-  advertiseAddress: "{{ ansible_host }}"
+  advertiseAddress: "{{ ansible_default_ipv4.address }}"
   bindPort: 6443
 {% if kubernetes_certificateKey is defined %}
 certificateKey: "{{ kubernetes_certificateKey.stdout }}"
@@ -56,7 +60,7 @@ discovery:
     token: "{{ kubetoken.stdout }}"
 nodeRegistration:
   kubeletExtraArgs:
-    node-ip: {{ ansible_host }}
+    node-ip: {{ ansible_default_ipv4.address }}
     read-only-port: "10255"
   ignorePreflightErrors:
   - SystemVerification
@@ -75,7 +79,20 @@ apiServer:
   certSANs:
   - "{{ lb_kubemaster }}"
 {% endif %}
-{% if kubernetes_network == "flannel" %}
+{% if kubernetes_network == "flannel" or kubernetes_network == "calico" %}
 networking:
+{% if kubernetes_network == "flannel" %}
   podSubnet: "10.244.0.0/16"
-{% endif %}
+{% elif kubernetes_network == "calico" %}
+  podSubnet: "192.168.0.0/16"
+{% endif %}
+{% endif %}
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+{% if kubernetes_kubeproxy_mode is defined %}
+mode: {{ kubernetes_kubeproxy_mode }}
+{% endif %}
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration