calico improvement

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install ansible molecule[docker] docker
+        run: pip3 install ansible molecule molecule-plugins[docker] docker
 
       - name: Run Molecule tests.
         run: molecule test

defaults/main.yml

@@ -11,7 +11,7 @@ kubernetes_packages:
 
 kubernetes_version: '1.27'
 kubernetes_version_rhel_package: '1.25.1'
-kubernetes_version_fedora_package: "{{ kubernetes_version }}.2"
+kubernetes_version_fedora_package: "{{ kubernetes_version }}.3"
 kubernetes_role: control_plane
 
 # This is deprecated. Please use kubernetes_config_kubelet_configuration instead.
@@ -70,7 +70,7 @@ kubernetes_yum_repo_gpg_check: true
 kubernetes_flannel_manifest_file: https://raw.githubusercontent.com/flannel-io/flannel/master/Documentation/kube-flannel.yml
 
 # Calico config file.
-calico_version: v3.26.0
+calico_version: v3.26.1
 kubernetes_calico_manifest_file: "https://raw.githubusercontent.com/projectcalico/calico/{{ calico_version }}/manifests/tigera-operator.yaml"
 kubernetes_calico_configuration_file: "https://raw.githubusercontent.com/projectcalico/calico/{{ calico_version }}/manifests/custom-resources.yaml"
-kubernetes_calicoctl_file: "https://raw.githubusercontent.com/projectcalico/calico/{{ calico_version }}/manifests/calicoctl.yaml"
+kubernetes_calicoctl_file: "https://raw.githubusercontent.com/projectcalico/calico/{{ calico_version }}/manifests/calicoctl.yaml"

molecule/default/molecule.yml

@@ -9,7 +9,7 @@ platforms:
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
       - /var/lib/containerd
     cgroupns_mode: host
     privileged: true

tasks/control-plane-setup.yml

@@ -50,43 +50,48 @@
   register: flannel_result
   changed_when: "'created' in flannel_result.stdout"
   when: kubernetes_pod_network.cni == 'flannel'
-  until: flannel_result.rc == 0
-  retries: 5
-  delay: 10
+  until: flannel_result is not failed
+  retries: 12
+  delay: 5
 
 - name: Configure Calico networking.
-  command: "kubectl apply --server-side=true --force-conflicts -f {{ kubernetes_calico_manifest_file }}"
-  register: calico_result
-  changed_when: "'created' in calico_result.stdout"
+  kubernetes.core.k8s:
+    state: present
+    apply: True
+    src: "{{ kubernetes_calico_manifest_file }}"
+    server_side_apply:
+      force_conflicts: True
+      field_manager: ansible
   when: kubernetes_pod_network.cni == 'calico'
-  retries: 5
-  delay: 10
 
 - name: Create Calico configuration.
-  command: "kubectl create -f {{ kubernetes_calico_configuration_file }}"
-  register: calico_result
-  changed_when: "'created' in calico_result.stdout"
+  kubernetes.core.k8s:
+    state: present
+    apply: True
+    src: "{{ kubernetes_calico_configuration_file }}"
+    server_side_apply:
+      force_conflicts: True
+      field_manager: ansible
   when: kubernetes_pod_network.cni == 'calico'
-  failed_when: False
-  retries: 5
-  delay: 10
 
 - name: Install Calico ctl.
-  command: "kubectl create -f {{ kubernetes_calicoctl_file }}"
-  register: calico_result
-  changed_when: "'created' in calico_result.stdout"
+  kubernetes.core.k8s:
+    state: present
+    apply: True
+    src: "{{ kubernetes_calicoctl_file }}"
+    server_side_apply:
+      force_conflicts: True
+      field_manager: ansible
   when: kubernetes_pod_network.cni == 'calico'
-  failed_when: False
-  retries: 5
-  delay: 10
 
 - name: Get Kubernetes version for Weave installation.
   shell: kubectl version | base64 | tr -d '\n'
   changed_when: false
   register: kubectl_version
   when: kubernetes_pod_network.cni == 'weave'
-  retries: 5
-  delay: 10
+  until: kubectl_version is not failed
+  retries: 12
+  delay: 5
 
 - name: Configure Weave networking.
   command: "{{ item }}"