diff --git a/tests/e2e/ansible/group_vars/all b/tests/e2e/ansible/group_vars/all index c53d87d6..3a786520 100644 --- a/tests/e2e/ansible/group_vars/all +++ b/tests/e2e/ansible/group_vars/all @@ -26,7 +26,7 @@ kubeadm_pkgs: centos: - conntrack - socat -k8s_version: v1.24.0 +k8s_version: v1.30.1 test_pkgs: ubuntu: - jq diff --git a/tests/e2e/ansible/install_containerd.yaml b/tests/e2e/ansible/install_containerd.yaml index 5ea9ee1b..1cbfcae4 100644 --- a/tests/e2e/ansible/install_containerd.yaml +++ b/tests/e2e/ansible/install_containerd.yaml @@ -28,7 +28,7 @@ - name: Re-create containerd config shell: | mkdir -p /etc/containerd/ - containerd config default > /etc/containerd/config.toml + containerd config default | sed -e 's/\(SystemdCgroup =\).*/\1 true/g' | tee /etc/containerd/config.toml args: executable: /bin/bash - name: Restart containerd service diff --git a/tests/e2e/ansible/install_kubeadm.yaml b/tests/e2e/ansible/install_kubeadm.yaml index b8dca6e8..22540a8b 100644 --- a/tests/e2e/ansible/install_kubeadm.yaml +++ b/tests/e2e/ansible/install_kubeadm.yaml @@ -10,16 +10,15 @@ become: yes vars: cni_home: "/opt/cni" - cni_version: "v1.1.1" + cni_version: "v1.5.1" flannel_home: "/opt/flannel" - flannel_version: "v0.19.1" + flannel_version: "v0.25.6" kubeadm_cri_runtime_socket: "/run/containerd/containerd.sock" kubeadm_conf_dir: "/etc/kubeadm" kubelet_bin: "/usr/local/bin/kubelet" kubelet_service_dir: "/etc/systemd/system/kubelet.service.d" kubelet_service_file: "/etc/systemd/system/kubelet.service" - # Use 'cgroupfs' with containerd, 'systemd' with crio? - kubelet_cgroup_driver: "cgroupfs" + kubelet_cgroup_driver: "systemd" tasks: - name: Install kubeadm required packages package: @@ -53,17 +52,24 @@ creates: /usr/local/bin/crictl dest: /usr/local/bin remote_src: yes - - name: Install kube binaries + - name: Download kube binaries get_url: - url: https://storage.googleapis.com/kubernetes-release/release/{{ k8s_version }}/bin/linux/{{ target_arch }}/{{ item }} - dest: /usr/local/bin - mode: '+x' + url: https://dl.k8s.io/{{ k8s_version }}/kubernetes-node-linux-{{ target_arch }}.tar.gz + dest: /tmp/kubernetes-node-linux.tar.gz retries: 3 delay: 10 - with_items: - - kubeadm - - kubelet - - kubectl + - name: Install kube binaries + unarchive: + src: /tmp/kubernetes-node-linux.tar.gz + dest: /usr/local/bin + remote_src: yes + extra_opts: + - --strip-components + - 3 + #include: + # - kubeadm + # - kubectl + # - kubelet - name: Remove zram-generator-defaults in Fedora ansible.builtin.yum: name: zram-generator-defaults diff --git a/tests/e2e/ansible/templates/kubeadm.conf.j2 b/tests/e2e/ansible/templates/kubeadm.conf.j2 index e91dafed..6343120b 100644 --- a/tests/e2e/ansible/templates/kubeadm.conf.j2 +++ b/tests/e2e/ansible/templates/kubeadm.conf.j2 @@ -20,7 +20,7 @@ apiServer: extraArgs: feature-gates: PodOverhead=true timeoutForControlPlane: 4m0s -imageRepository: k8s.gcr.io +imageRepository: registry.k8s.io scheduler: extraArgs: feature-gates: PodOverhead=true