diff --git a/defaults/main.yml b/defaults/main.yml index 49d542c..d6fb683 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,10 +8,7 @@ kubernetes_interface: '{{ ansible_default_ipv4.interface }}' kubernetes_kubeproxy_mode: ipvs kubernetes_version: 1.31.0 kubernetes_k3s_version: 1.31.0+k3s1 -#kubernetes_pods_network: "10.244.0.0/16" -#kubernetes_svc_network: "10.96.0.0/12" -kubernetes_pods_network: "10.42.0.0/16" -kubernetes_svc_network: "10.43.0.0/16" +kubernetes_pods_network: "10.244.0.0/16" lb_auth_pass: 1be344d62acc46c6858ae8475668a245 kubernetes_swap_enabled: false kubernetes_lvm: true diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index bcbf718..cae93ba 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -119,7 +119,7 @@ - kubernetes_server|bool with_items: - "{{ kubernetes_pods_network }}" - - "{{ kubernetes_svc_network }}" + - "10.96.0.0/12" - name: Add kubernetes networks to trusted firewalld zone ansible.posix.firewalld: diff --git a/templates/etc/rancher/k3s/config.yaml.j2 b/templates/etc/rancher/k3s/config.yaml.j2 index bed1d77..fb504b7 100644 --- a/templates/etc/rancher/k3s/config.yaml.j2 +++ b/templates/etc/rancher/k3s/config.yaml.j2 @@ -1,8 +1,4 @@ -{% if 'Vpn' in group_names %} -flannel-backend: vxlan -{% else %} flannel-backend: wireguard-native -{% endif %} protect-kernel-defaults: true {% if kubernetes_master|bool %} secrets-encryption: true @@ -17,10 +13,6 @@ kube-apiserver-arg: # - "request-timeout=300s" kube-controller-manager-arg: - 'terminated-pod-gc-threshold=10' -cluster-cidr: - - {{ kubernetes_pods_network }} -service-cidr: - - {{ kubernetes_svc_network }} {% if vars['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined %} cluster-init: true {% else %} @@ -40,11 +32,6 @@ selinux: true #embedded-registry: true disable: - traefik -{% if kubernetes_interface is defined %} -node-ip: {{ kubernetes_interface.address }} -#node-ip: {{ lookup('vars', 'ansible_' + kubernetes_interface ).ipv4.address }} -{% endif %} -node-external-ip: {{ ansible_host }} {% if false %} # node-external-ip: 1.2.3.4 #node-label: diff --git a/templates/kubeadm-config.yaml.j2 b/templates/kubeadm-config.yaml.j2 index 7d833b5..00ee1b7 100644 --- a/templates/kubeadm-config.yaml.j2 +++ b/templates/kubeadm-config.yaml.j2 @@ -85,7 +85,6 @@ apiServer: {% if kubernetes_network == "flannel" or kubernetes_network == "calico" %} networking: podSubnet: "{{ kubernetes_pods_network }}" - serviceSubnet: "{{ kubernetes_svc_network }}" {% endif %} controllerManager: extraArgs: