diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1454abd..9d9d3db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,13 +43,13 @@ jobs: include: - distro: rockylinux8 playbook: converge.yml - # - distro: ubuntu2004 - # playbook: converge.yml - # - distro: debian11 - # playbook: converge.yml + - distro: ubuntu2004 + playbook: converge.yml + - distro: debian11 + playbook: converge.yml - # - distro: debian11 - # playbook: calico.yml + - distro: debian11 + playbook: calico.yml steps: - name: Check out the codebase. diff --git a/README.md b/README.md index 6e79a3d..c0ff006 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ kubernetes_packages: Kubernetes packages to be installed on the server. You can either provide a list of package names, or set `name` and `state` to have more control over whether the package is `present`, `absent`, `latest`, etc. ```yaml -kubernetes_version: '1.25' -kubernetes_version_rhel_package: '1.25.0' +kubernetes_version: '1.24' +kubernetes_version_rhel_package: '1.24.4' ``` The minor version of Kubernetes to install. The plain `kubernetes_version` is used to pin an apt package version on Debian, and as the Kubernetes version passed into the `kubeadm init` command (see `kubernetes_version_kubeadm`). The `kubernetes_version_rhel_package` variable must be a specific Kubernetes release, and is used to pin the version on Red Hat / CentOS servers. diff --git a/defaults/main.yml b/defaults/main.yml index a1ca4b1..8aeaceb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,8 +9,8 @@ kubernetes_packages: - name: kubernetes-cni state: present -kubernetes_version: '1.25' -kubernetes_version_rhel_package: '1.25.0' +kubernetes_version: '1.24' +kubernetes_version_rhel_package: '1.24.4' kubernetes_role: control_plane diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index cc47e45..514da27 100644 --- a/molecule/default/molecule.yml +++ b/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:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw - /var/lib/containerd privileged: true pre_build_image: true diff --git a/tasks/control-plane-setup.yml b/tasks/control-plane-setup.yml index 609fd47..347e5cc 100644 --- a/tasks/control-plane-setup.yml +++ b/tasks/control-plane-setup.yml @@ -25,21 +25,6 @@ {{ kubernetes_kubeadm_init_extra_opts }} register: kubeadmin_init when: (not kubernetes_init_stat.stat.exists) and (kubernetes_ignore_preflight_errors is defined) -# failed_when: false # DELETEME START --- -# - name: Test -# command: systemctl status kubelet -# changed_when: false -# register: systemctl_result - -# - debug: var=systemctl_result - -# - name: Test 2 -# command: journalctl --no-pager -xeu kubelet -# changed_when: false -# register: journalctl_result - -# - debug: var=journalctl_result -# # DELETEME END --- - name: Print the init output to screen. debug: