Compare commits

...

2 commits

Author SHA1 Message Date
453ed3df65
Add forgoten file 2024-09-16 16:46:57 +02:00
e6206ca929
Fix pod & svc network 2024-09-16 16:46:19 +02:00
4 changed files with 19 additions and 2 deletions

View file

@ -8,7 +8,10 @@ kubernetes_interface: '{{ ansible_default_ipv4.interface }}'
kubernetes_kubeproxy_mode: ipvs kubernetes_kubeproxy_mode: ipvs
kubernetes_version: 1.31.0 kubernetes_version: 1.31.0
kubernetes_k3s_version: 1.31.0+k3s1 kubernetes_k3s_version: 1.31.0+k3s1
kubernetes_pods_network: "10.244.0.0/16" #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"
lb_auth_pass: 1be344d62acc46c6858ae8475668a245 lb_auth_pass: 1be344d62acc46c6858ae8475668a245
kubernetes_swap_enabled: false kubernetes_swap_enabled: false
kubernetes_lvm: true kubernetes_lvm: true

View file

@ -119,7 +119,7 @@
- kubernetes_server|bool - kubernetes_server|bool
with_items: with_items:
- "{{ kubernetes_pods_network }}" - "{{ kubernetes_pods_network }}"
- "10.96.0.0/12" - "{{ kubernetes_svc_network }}"
- name: Add kubernetes networks to trusted firewalld zone - name: Add kubernetes networks to trusted firewalld zone
ansible.posix.firewalld: ansible.posix.firewalld:

View file

@ -1,4 +1,8 @@
{% if 'Vpn' in group_names %}
flannel-backend: vxlan
{% else %}
flannel-backend: wireguard-native flannel-backend: wireguard-native
{% endif %}
protect-kernel-defaults: true protect-kernel-defaults: true
{% if kubernetes_master|bool %} {% if kubernetes_master|bool %}
secrets-encryption: true secrets-encryption: true
@ -13,6 +17,10 @@ kube-apiserver-arg:
# - "request-timeout=300s" # - "request-timeout=300s"
kube-controller-manager-arg: kube-controller-manager-arg:
- 'terminated-pod-gc-threshold=10' - 'terminated-pod-gc-threshold=10'
cluster-cidr:
- {{ kubernetes_pods_network }}
service-cidr:
- {{ kubernetes_svc_network }}
{% if vars['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined %} {% if vars['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined %}
cluster-init: true cluster-init: true
{% else %} {% else %}
@ -32,6 +40,11 @@ selinux: true
#embedded-registry: true #embedded-registry: true
disable: disable:
- traefik - 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 %} {% if false %}
# node-external-ip: 1.2.3.4 # node-external-ip: 1.2.3.4
#node-label: #node-label:

View file

@ -85,6 +85,7 @@ apiServer:
{% if kubernetes_network == "flannel" or kubernetes_network == "calico" %} {% if kubernetes_network == "flannel" or kubernetes_network == "calico" %}
networking: networking:
podSubnet: "{{ kubernetes_pods_network }}" podSubnet: "{{ kubernetes_pods_network }}"
serviceSubnet: "{{ kubernetes_svc_network }}"
{% endif %} {% endif %}
controllerManager: controllerManager:
extraArgs: extraArgs: