files/etc/NetworkManager/conf.d/calico.conf

@@ -1,3 +1,2 @@
-# https://docs.tigera.io/calico/latest/operations/troubleshoot/troubleshooting#configure-networkmanager
 [keyfile]
 unmanaged-devices=interface-name:cali*;interface-name:tunl*;interface-name:vxlan.calico;interface-name:wireguard.cali

files/etc/kubernetes/psa.yaml

@@ -15,7 +15,7 @@ plugins:
     exemptions:
       usernames: []
       runtimeClasses: []
-      namespaces: [kube-system, cis-operator-system]
+      namespaces: [kube-system, system-upgrade, cis-operator-system]
 - name: EventRateLimit
   configuration:
     apiVersion: eventratelimit.admission.k8s.io/v1alpha1

tasks/install_server.yml

@@ -89,18 +89,6 @@
     - kubernetes_master|bool
     - kubernetes_cri == "k3s"
 
-- name: Make link from /etc/rancher/k3s/k3s.yaml to /etc/kubernetes/admin.conf
-  file:
-    src: "/etc/rancher/k3s/k3s.yaml"
-    state: link
-    dest: "/etc/kubernetes/admin.conf"
-    force: yes
-    owner: root
-    group: root
-  when:
-    - kubernetes_master|bool
-    - kubernetes_cri == "k3s"
-
 #
 # Manque autoconfig de .kube/config local
 #
@@ -112,7 +100,6 @@
 #   when:
 #     - kubernetes_master|bigip_pool
 
-# kubectl get nodes -o custom-columns=NAME:.metadata.name,TAINTS:.spec.taints --no-headers
 - name: Check if a node is still tainted
   ansible.builtin.command: kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes '{{ ansible_hostname | lower }}' -o jsonpath='{.spec.taints}'
   register: current_taint

templates/etc/rancher/k3s/config.yaml.j2

@@ -40,10 +40,11 @@ selinux: true
 #embedded-registry: true
 disable:
   - traefik
-{% if lookup('vars', 'ansible_' + kubernetes_interface ) != ansible_host %}
+{% if kubernetes_interface is defined %}
-node-external-ip: {{ ansible_host }}
+node-ip: {{ kubernetes_interface.address }}
+#node-ip: {{ lookup('vars', 'ansible_' + kubernetes_interface ).ipv4.address }}
 {% endif %}
-node-ip: {{ lookup('vars', 'ansible_' + kubernetes_interface ).ipv4.address }}
+node-external-ip: {{ ansible_host }}
 {% if false %}
 # node-external-ip: 1.2.3.4
 #node-label: