diff --git a/CHANGELOG.md b/CHANGELOG.md index 33d7470..1b33ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,11 @@ ### Major Changes - - Upgrade minimal Ansible community package support to 4.1.0 +## 20210718.1.1 - 2021-07-18 + +### Major Changes + + - Upgrade minimal Ansible community package support to 4.2.0 - Support Kubernetes 1.21 - Support Kubernetes 1.20 - Support Kubernetes 1.19 @@ -13,5 +17,8 @@ ## 1.19.3-4alvistack1 - 2020-10-23 - Ubuntu 18.04/20.04 based - - Base box running by [Vagrant Libvirt Provider](https://github.com/vagrant-libvirt/vagrant-libvirt) - - Provision by [Ansible](https://www.ansible.com/) and [Molecule Vagrant Plugin](https://github.com/ansible-community/molecule-vagrant) + - Base box running by [Vagrant Libvirt + Provider](https://github.com/vagrant-libvirt/vagrant-libvirt) + - Provision by [Ansible](https://www.ansible.com/) and [Molecule + Vagrant + Plugin](https://github.com/ansible-community/molecule-vagrant) diff --git a/README.md b/README.md index 5f1c049..b9c6ac7 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,16 @@ # Vagrant Box Packaging for Kubernetes -[![Gitlab pipeline status](https://img.shields.io/gitlab/pipeline/alvistack/vagrant-kubernetes/master)](https://gitlab.com/alvistack/vagrant-kubernetes/-/pipelines) -[![GitHub release](https://img.shields.io/github/release/alvistack/vagrant-kubernetes.svg)](https://github.com/alvistack/vagrant-kubernetes/releases) -[![GitHub license](https://img.shields.io/github/license/alvistack/vagrant-kubernetes.svg)](https://github.com/alvistack/vagrant-kubernetes/blob/master/LICENSE) -\-[![Vagrant Box download](https://img.shields.io/badge/dynamic/json?label=alvistack%2Fkubernetes-1.21&query=%24.boxes%5B%3A1%5D.downloads&url=https%3A%2F%2Fapp.vagrantup.com%2Fapi%2Fv1%2Fsearch%3Fq%3Dalvistack%2Fkubernetes-1.21)](https://app.vagrantup.com/alvistack/boxes/kubernetes-1.21) - -Kubernetes (K8s) is an open-source system for automating deployment, scaling, and management of containerized applications. +[![Gitlab pipeline +status](https://img.shields.io/gitlab/pipeline/alvistack/vagrant-kubernetes/master)](https://gitlab.com/alvistack/vagrant-kubernetes/-/pipelines) +[![GitHub +release](https://img.shields.io/github/release/alvistack/vagrant-kubernetes.svg)](https://github.com/alvistack/vagrant-kubernetes/releases) +[![GitHub +license](https://img.shields.io/github/license/alvistack/vagrant-kubernetes.svg)](https://github.com/alvistack/vagrant-kubernetes/blob/master/LICENSE) +-[![Vagrant Box +download](https://img.shields.io/badge/dynamic/json?label=alvistack%2Fkubernetes-1.21&query=%24.boxes%5B%3A1%5D.downloads&url=https%3A%2F%2Fapp.vagrantup.com%2Fapi%2Fv1%2Fsearch%3Fq%3Dalvistack%2Fkubernetes-1.21)](https://app.vagrantup.com/alvistack/boxes/kubernetes-1.21) + +Kubernetes (K8s) is an open-source system for automating deployment, +scaling, and management of containerized applications. Learn more about Kubernetes: @@ -21,14 +26,20 @@ Learn more about Kubernetes: ## Overview - Packaging with [Packer](https://www.packer.io/) - - Support [Vagrant](https://www.vagrantup.com/) as default [Kubernetes custom executor](https://docs.gitlab.com/runner/executors/README.html) - - Support [Libvirt](https://libvirt.org/) with [vagrant-libvirt](https://github.com/vagrant-libvirt/vagrant-libvirt) + - Support [Vagrant](https://www.vagrantup.com/) as default [Kubernetes + custom + executor](https://docs.gitlab.com/runner/executors/README.html) + - Support [Libvirt](https://libvirt.org/) with + [vagrant-libvirt](https://github.com/vagrant-libvirt/vagrant-libvirt) - Support [VirtualBox](https://www.virtualbox.org/) - Support [Docker](https://www.docker.com/) ### Quick Start -Once you have [Vagrant](https://www.vagrantup.com/docs/installation) and [VirtaulBox](https://www.virtualbox.org/) installed, run the following commands under your [project directory](https://learn.hashicorp.com/tutorials/vagrant/getting-started-project-setup?in=vagrant/getting-started): +Once you have [Vagrant](https://www.vagrantup.com/docs/installation) and +[VirtaulBox](https://www.virtualbox.org/) installed, run the following +commands under your [project +directory](https://learn.hashicorp.com/tutorials/vagrant/getting-started-project-setup?in=vagrant/getting-started): # Initialize Vagrant vagrant init alvistack/kubernetes-1.21 @@ -46,16 +57,23 @@ Once you have [Vagrant](https://www.vagrantup.com/docs/installation) and [Virtau ### `YYYYMMDD.Y.Z` -Release tags could be find from [GitHub Release](https://github.com/alvistack/vagrant-kubernetes/releases) of this repository. Thus using these tags will ensure you are running the most up to date stable version of this image. +Release tags could be find from [GitHub +Release](https://github.com/alvistack/vagrant-kubernetes/releases) of +this repository. Thus using these tags will ensure you are running the +most up to date stable version of this image. ### `YYYYMMDD.0.0` -Version tags ended with `.0.0` are rolling release rebuild by [GitLab pipeline](https://gitlab.com/alvistack/vagrant-kubernetes/-/pipelines) in weekly basis. Thus using these tags will ensure you are running the latest packages provided by the base image project. +Version tags ended with `.0.0` are rolling release rebuild by [GitLab +pipeline](https://gitlab.com/alvistack/vagrant-kubernetes/-/pipelines) +in weekly basis. Thus using these tags will ensure you are running the +latest packages provided by the base image project. ## License - Code released under [Apache License 2.0](LICENSE) - - Docs released under [CC BY 4.0](http://creativecommons.org/licenses/by/4.0/) + - Docs released under [CC + BY 4.0](http://creativecommons.org/licenses/by/4.0/) ## Author Information diff --git a/packer/libvirt-1.20/group_vars/all/99-packer.yml b/packer/libvirt-1.20/group_vars/all/99-packer.yml index 5b2dce8..3794f96 100644 --- a/packer/libvirt-1.20/group_vars/all/99-packer.yml +++ b/packer/libvirt-1.20/group_vars/all/99-packer.yml @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -kubernetes_release: "v1.20" +kubernetes_release: "1.20" diff --git a/packer/libvirt-1.20/packer.json b/packer/libvirt-1.20/packer.json index 30385ad..1f5a2fa 100644 --- a/packer/libvirt-1.20/packer.json +++ b/packer/libvirt-1.20/packer.json @@ -27,7 +27,7 @@ "/casper/vmlinuz ", "initrd=/casper/initrd ", "autoinstall quiet fsck.mode=skip ", - "net.ifnames=0 biosdevname=0 ", + "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 ", "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ ", "---" ], diff --git a/packer/libvirt-1.20/user-data b/packer/libvirt-1.20/user-data index 8027f07..81ba6ed 100644 --- a/packer/libvirt-1.20/user-data +++ b/packer/libvirt-1.20/user-data @@ -75,8 +75,8 @@ autoinstall: ssh-keygen -A; \ systemctl enable ssh.service; \ sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ update-grub; \ update-initramfs -c -k all; \ apt-get -y purge snapd; \ diff --git a/packer/libvirt-1.21/group_vars/all/99-packer.yml b/packer/libvirt-1.21/group_vars/all/99-packer.yml index 97a5584..f11b466 100644 --- a/packer/libvirt-1.21/group_vars/all/99-packer.yml +++ b/packer/libvirt-1.21/group_vars/all/99-packer.yml @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -kubernetes_release: "v1.21" +kubernetes_release: "1.21" diff --git a/packer/libvirt-1.21/packer.json b/packer/libvirt-1.21/packer.json index 30385ad..1f5a2fa 100644 --- a/packer/libvirt-1.21/packer.json +++ b/packer/libvirt-1.21/packer.json @@ -27,7 +27,7 @@ "/casper/vmlinuz ", "initrd=/casper/initrd ", "autoinstall quiet fsck.mode=skip ", - "net.ifnames=0 biosdevname=0 ", + "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 ", "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ ", "---" ], diff --git a/packer/libvirt-1.21/user-data b/packer/libvirt-1.21/user-data index 8027f07..81ba6ed 100644 --- a/packer/libvirt-1.21/user-data +++ b/packer/libvirt-1.21/user-data @@ -75,8 +75,8 @@ autoinstall: ssh-keygen -A; \ systemctl enable ssh.service; \ sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ update-grub; \ update-initramfs -c -k all; \ apt-get -y purge snapd; \ diff --git a/packer/virtualbox-1.20/group_vars/all/99-packer.yml b/packer/virtualbox-1.20/group_vars/all/99-packer.yml index 5b2dce8..3794f96 100644 --- a/packer/virtualbox-1.20/group_vars/all/99-packer.yml +++ b/packer/virtualbox-1.20/group_vars/all/99-packer.yml @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -kubernetes_release: "v1.20" +kubernetes_release: "1.20" diff --git a/packer/virtualbox-1.20/packer.json b/packer/virtualbox-1.20/packer.json index 208f34a..072fc83 100644 --- a/packer/virtualbox-1.20/packer.json +++ b/packer/virtualbox-1.20/packer.json @@ -26,7 +26,7 @@ "/casper/vmlinuz ", "initrd=/casper/initrd ", "autoinstall quiet fsck.mode=skip ", - "net.ifnames=0 biosdevname=0 ", + "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 ", "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ ", "---" ], diff --git a/packer/virtualbox-1.20/user-data b/packer/virtualbox-1.20/user-data index 8027f07..81ba6ed 100644 --- a/packer/virtualbox-1.20/user-data +++ b/packer/virtualbox-1.20/user-data @@ -75,8 +75,8 @@ autoinstall: ssh-keygen -A; \ systemctl enable ssh.service; \ sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ update-grub; \ update-initramfs -c -k all; \ apt-get -y purge snapd; \ diff --git a/packer/virtualbox-1.21/group_vars/all/99-packer.yml b/packer/virtualbox-1.21/group_vars/all/99-packer.yml index 97a5584..f11b466 100644 --- a/packer/virtualbox-1.21/group_vars/all/99-packer.yml +++ b/packer/virtualbox-1.21/group_vars/all/99-packer.yml @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -kubernetes_release: "v1.21" +kubernetes_release: "1.21" diff --git a/packer/virtualbox-1.21/packer.json b/packer/virtualbox-1.21/packer.json index 208f34a..072fc83 100644 --- a/packer/virtualbox-1.21/packer.json +++ b/packer/virtualbox-1.21/packer.json @@ -26,7 +26,7 @@ "/casper/vmlinuz ", "initrd=/casper/initrd ", "autoinstall quiet fsck.mode=skip ", - "net.ifnames=0 biosdevname=0 ", + "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 ", "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ ", "---" ], diff --git a/packer/virtualbox-1.21/user-data b/packer/virtualbox-1.21/user-data index 8027f07..81ba6ed 100644 --- a/packer/virtualbox-1.21/user-data +++ b/packer/virtualbox-1.21/user-data @@ -75,8 +75,8 @@ autoinstall: ssh-keygen -A; \ systemctl enable ssh.service; \ sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ - sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ + sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \ update-grub; \ update-initramfs -c -k all; \ apt-get -y purge snapd; \ diff --git a/playbooks/converge.yml b/playbooks/converge.yml index 857cb74..9c7464e 100644 --- a/playbooks/converge.yml +++ b/playbooks/converge.yml @@ -148,11 +148,11 @@ - name: include role include_role: - name: kubeadm + name: kubelet - name: include role include_role: - name: kubelet + name: kubeadm - name: include role include_role: diff --git a/playbooks/prepare.yml b/playbooks/prepare.yml index 79c36ad..8614c15 100644 --- a/playbooks/prepare.yml +++ b/playbooks/prepare.yml @@ -102,7 +102,7 @@ - name: fedora | yum install *.rpm raw: | set -eu - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-dnf-plugin-versionlock python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip when: ansible_distribution | lower == "fedora" changed_when: false failed_when: false @@ -111,7 +111,7 @@ raw: | set -eu yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-dnf-plugin-versionlock python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip when: ansible_os_family | lower == "redhat" and ansible_distribution_major_version | lower == "8" changed_when: false failed_when: false @@ -121,7 +121,7 @@ set -eu subscription-manager repos --enable=rhel-7-server-optional-rpms || echo $? yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-devel python3-jmespath python3-libselinux python3-lxml python3-pip python3-setuptools python3-virtualenv python3-wheel python36-cryptography python36-netaddr rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-devel python3-jmespath python3-libselinux python3-lxml python3-pip python3-setuptools python3-virtualenv python3-wheel python36-cryptography python36-netaddr rsync shadow-utils sudo tar unzip util-linux xz yum-plugin-versionlock yum-utils zip when: ansible_os_family | lower == "redhat" and ansible_distribution_major_version | lower == "7" changed_when: false failed_when: false diff --git a/playbooks/tasks/debian.yml b/playbooks/tasks/debian.yml index 7cc40a6..6a27486 100644 --- a/playbooks/tasks/debian.yml +++ b/playbooks/tasks/debian.yml @@ -48,8 +48,8 @@ state: "present" loop: - { option: "GRUB_DEFAULT", value: "0" } - - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" } - - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" } + - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" } + - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" } - name: update-grub command: update-grub diff --git a/playbooks/tasks/redhat.yml b/playbooks/tasks/redhat.yml index e186e99..87cba0e 100644 --- a/playbooks/tasks/redhat.yml +++ b/playbooks/tasks/redhat.yml @@ -39,8 +39,8 @@ state: "present" loop: - { option: "GRUB_DEFAULT", value: "0" } - - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" } - - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" } + - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" } + - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" } - name: grub2-mkconfig -o /boot/grub2/grub.cfg command: grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/playbooks/tasks/suse.yml b/playbooks/tasks/suse.yml index d583b21..cffe5db 100644 --- a/playbooks/tasks/suse.yml +++ b/playbooks/tasks/suse.yml @@ -56,8 +56,8 @@ state: "present" loop: - { option: "GRUB_DEFAULT", value: "0" } - - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" } - - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" } + - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" } + - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" } - name: grub2-mkconfig -o /boot/grub2/grub.cfg command: grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/roles/ansible b/roles/ansible index 0dfb2ae..84a6af3 160000 --- a/roles/ansible +++ b/roles/ansible @@ -1 +1 @@ -Subproject commit 0dfb2ae84f79cbb76686491ce159ecd180f1448f +Subproject commit 84a6af3d6df3cf5f03e276189c7df380107aeb80 diff --git a/roles/cloud_init b/roles/cloud_init index c5b4940..3fb56f0 160000 --- a/roles/cloud_init +++ b/roles/cloud_init @@ -1 +1 @@ -Subproject commit c5b4940cec475377537fdc1cdacd68188d39b258 +Subproject commit 3fb56f08b6689baf96f6f2b27ba89e46dbb14913 diff --git a/roles/conmon b/roles/conmon index ba0bebe..42c6cdb 160000 --- a/roles/conmon +++ b/roles/conmon @@ -1 +1 @@ -Subproject commit ba0bebecc2cd2105e5b2b8493a399e7eb0556113 +Subproject commit 42c6cdbff010679f031c73cd0c2117ad26b08e4d diff --git a/roles/containernetworking_plugins b/roles/containernetworking_plugins index 7512c83..ed8657b 160000 --- a/roles/containernetworking_plugins +++ b/roles/containernetworking_plugins @@ -1 +1 @@ -Subproject commit 7512c8357af628a45f53b7cb7ed5090e4cfe8312 +Subproject commit ed8657bf6bc136899ac7074316d86252050c9fe0 diff --git a/roles/containers_common b/roles/containers_common index 3b7af86..a305874 160000 --- a/roles/containers_common +++ b/roles/containers_common @@ -1 +1 @@ -Subproject commit 3b7af862016f44e5dd8cebf7a059417820b92b24 +Subproject commit a305874bc69b4728539ee83a0893646a19592971 diff --git a/roles/cri_o b/roles/cri_o index c5bb479..98a7c7c 160000 --- a/roles/cri_o +++ b/roles/cri_o @@ -1 +1 @@ -Subproject commit c5bb479d51067903f6d0d5e07bfb3616fa05c7f1 +Subproject commit 98a7c7c2df4da7e90366d1a263b85816b3758e82 diff --git a/roles/cri_tools b/roles/cri_tools index cdbd60d..bdf95f0 160000 --- a/roles/cri_tools +++ b/roles/cri_tools @@ -1 +1 @@ -Subproject commit cdbd60d5718a42ba476c5caea2a2876db765e0f0 +Subproject commit bdf95f0dfe3f735cae4bacd9a75e737dee790015 diff --git a/roles/crun b/roles/crun index edc6bc4..aa9056c 160000 --- a/roles/crun +++ b/roles/crun @@ -1 +1 @@ -Subproject commit edc6bc43c507052aa20b0c8c906e1ed0dc557ab7 +Subproject commit aa9056cbe185fee9c8314fb89d9adbdc28c42736 diff --git a/roles/etcd b/roles/etcd index b3a0a17..30fff8b 160000 --- a/roles/etcd +++ b/roles/etcd @@ -1 +1 @@ -Subproject commit b3a0a17a049f15b9be2ce57c3b6d3fc371497ee4 +Subproject commit 30fff8bf6a70570851cdfc0196a434821ce5910b diff --git a/roles/fuse_overlayfs b/roles/fuse_overlayfs index 30da594..7dcdc21 160000 --- a/roles/fuse_overlayfs +++ b/roles/fuse_overlayfs @@ -1 +1 @@ -Subproject commit 30da5945cd847d73c4d554525d4c26e8e4b8212a +Subproject commit 7dcdc216a44b4cbd759543eccc3e5e7dcf44a5bf diff --git a/roles/kernel b/roles/kernel index 8aac438..f766e68 160000 --- a/roles/kernel +++ b/roles/kernel @@ -1 +1 @@ -Subproject commit 8aac438dd46c77e5108f48776167e99231bf25ae +Subproject commit f766e683259ba6902c73f3765d11c2085404db33 diff --git a/roles/kube_master b/roles/kube_master index dd3f4cb..709cb63 160000 --- a/roles/kube_master +++ b/roles/kube_master @@ -1 +1 @@ -Subproject commit dd3f4cbb3aeb59ebd8040f7e24456b6e6175b3d8 +Subproject commit 709cb63d5c5b50bf637b05eabecdd45df45de342 diff --git a/roles/kubeadm b/roles/kubeadm index 5c04858..afe9a71 160000 --- a/roles/kubeadm +++ b/roles/kubeadm @@ -1 +1 @@ -Subproject commit 5c04858c7085c5877d36e7531162e2a753246ceb +Subproject commit afe9a710f3b55e03c9a59e94aa574f1c7c0c311c diff --git a/roles/kubectl b/roles/kubectl index c8efe71..3dfe9c2 160000 --- a/roles/kubectl +++ b/roles/kubectl @@ -1 +1 @@ -Subproject commit c8efe7112c79c6b99d442ba2d46e3fb4572db564 +Subproject commit 3dfe9c2b91d313e646d6ce7fe17ca8cc183f6d6d diff --git a/roles/kubelet b/roles/kubelet index 1d84849..729ab9c 160000 --- a/roles/kubelet +++ b/roles/kubelet @@ -1 +1 @@ -Subproject commit 1d84849df76290bc8f35af2753fa3ae9d0689859 +Subproject commit 729ab9c167b9267183a34cf31653890cff119cde diff --git a/roles/locales b/roles/locales index a089b4a..39e5017 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit a089b4a04d3c550f53a62fd08e98b945f936ef18 +Subproject commit 39e501722ae8febd064559f127abaa7fdfbb5cd6 diff --git a/roles/python b/roles/python index 5a1ed96..d249f68 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 5a1ed961dbb7c289cd9704d8374409d61304c5e6 +Subproject commit d249f68cbc12531655ca2aad6778b017c851c251 diff --git a/roles/sonobuoy b/roles/sonobuoy index 2f612c2..2568dd3 160000 --- a/roles/sonobuoy +++ b/roles/sonobuoy @@ -1 +1 @@ -Subproject commit 2f612c28512c5d78a89f5f80c58c3ae2845ac303 +Subproject commit 2568dd3c0851cdacab93522d83c0a90f8e0c980f diff --git a/roles/sshd b/roles/sshd index bf9e03c..ddae9af 160000 --- a/roles/sshd +++ b/roles/sshd @@ -1 +1 @@ -Subproject commit bf9e03c27eb0e86b5713ab8cb69e8f33a684ecd5 +Subproject commit ddae9af53c4c18e25494d015768707a1e4533e04 diff --git a/roles/timezone b/roles/timezone index 40ee7a8..e4501ad 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit 40ee7a8fb4df7ee9a61653a4b40fd4793dfcded5 +Subproject commit e4501ad022833f038b2691d0e45575c79b02c97c diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 4b100e6..80af816 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -30,7 +30,7 @@ fi if [ -x "$(command -v yum)" ]; then yum makecache yum update -y - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel sudo tar unzip xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-dnf-plugin-versionlock python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel sudo tar unzip xz yum-utils zip fi # Prepare Zypper dependencies