Merge da0de4ce91 into 83e86bb88b

defaults/main.yml

@@ -9,8 +9,8 @@ kubernetes_packages:
   - name: kubernetes-cni
     state: present
 
-kubernetes_version: '1.32'
-kubernetes_version_rhel_package: '1.32'
+kubernetes_version: '1.33'
+kubernetes_version_rhel_package: '1.33'
 
 kubernetes_role: control_plane
 
@@ -30,7 +30,7 @@ kubernetes_pod_network:
 
 kubernetes_kubeadm_kubelet_config_file_path: '/etc/kubernetes/kubeadm-kubelet-config.yaml'
 
-kubernetes_config_kubeadm_apiversion: v1beta3
+kubernetes_config_kubeadm_apiversion: v1beta4
 kubenetes_config_kubelet_apiversion: v1beta1
 kubernetes_config_kubeproxy_apiversion: v1alpha1
 

molecule/default/requirements.yml

@@ -1,2 +1,6 @@
 ---
-- src: geerlingguy.containerd
+roles:
+  - src: geerlingguy.containerd
+
+collections:
+  - name: community.general

tasks/main.yml

@@ -8,9 +8,6 @@
 - include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- name: Ensure dependencies are installed.
-  package: name=curl state=present
-
 - name: Install Kubernetes packages.
   package:
     name: "{{ item.name | default(item) }}"

tasks/sysctl-setup.yml

@@ -7,6 +7,13 @@
     ansible_distribution != 'Debian'
     or ansible_distribution_major_version | int < 10
 
+- name: Ensure module br_netfilter is loaded
+  modprobe:
+    name: br_netfilter
+    state: present
+    persistent: present
+  when: not ansible_virtualization_type == "docker"
+
 # See: https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#letting-iptables-see-bridged-traffic
 - name: Let iptables see bridged traffic.
   sysctl:
@@ -17,5 +24,6 @@
     - net.bridge.bridge-nf-call-iptables
     - net.bridge.bridge-nf-call-ip6tables
   when: >
-    ansible_distribution != 'Debian'
-    or ansible_distribution_major_version | int < 10
+    ( ansible_distribution != 'Debian'
+      or ansible_distribution_major_version | int < 10
+    ) and not ansible_virtualization_type == "docker"