C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move nerdctl snapshotter option to overlayfs

Browse source
This commit is contained in:
Florian Ruynat 2022-07-19 11:06:35 +02:00
parent 3ce5458f32
commit e62802cf8a
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci/packet.yml
View file

@ -255,8 +255,8 @@ packet_fedora34-kube-ovn:
# Long jobs (45min+) # Long jobs (45min+)
packet_centos7-weave-upgrade-ha: packet_centos7-weave-upgrade-ha:
stage: deploy-part3 stage: unit-tests
extends: .packet_periodic extends: .packet_pr
when: on_success when: on_success
variables: variables:
UPGRADE_TEST: basic UPGRADE_TEST: basic

4
.gitlab-ci/vagrant.yml
View file

@ -35,9 +35,9 @@ vagrant_ubuntu18-flannel:
when: on_success when: on_success
vagrant_ubuntu18-weave-medium: vagrant_ubuntu18-weave-medium:
stage: deploy-part2 stage: unit-tests
extends: .vagrant extends: .vagrant
when: manual when: on_success
vagrant_ubuntu20-flannel: vagrant_ubuntu20-flannel:
stage: deploy-part2 stage: deploy-part2

2
roles/container-engine/nerdctl/templates/nerdctl.toml.j2
View file

@ -2,7 +2,7 @@ debug = false
debug_full = false debug_full = false
address = "{{ cri_socket }}" address = "{{ cri_socket }}"
namespace = "k8s.io" namespace = "k8s.io"
snapshotter = "native" snapshotter = "overlayfs"
cni_path = "/opt/cni/bin" cni_path = "/opt/cni/bin"
cni_netconfpath = "/etc/cni/net.d" cni_netconfpath = "/etc/cni/net.d"
cgroup_manager = "{{ kubelet_cgroup_driver | default('systemd') }}" cgroup_manager = "{{ kubelet_cgroup_driver | default('systemd') }}"

3
tests/scripts/testcases_run.sh
View file

@ -53,6 +53,9 @@ test "${UPGRADE_TEST}" != "false" && git fetch --all && git checkout "$KUBESPRAY
test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" tests/files/${CI_JOB_NAME}.yml test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" tests/files/${CI_JOB_NAME}.yml
test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" ${CI_TEST_REGISTRY_MIRROR} test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" ${CI_TEST_REGISTRY_MIRROR}
test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" ${CI_TEST_SETTING} test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" ${CI_TEST_SETTING}
### FIXME FLORYUT Needed for upgrade job, will be removed when releasing kubespray 2.20
test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" roles/container-engine/nerdctl/templates/nerdctl.toml.j2
### /FIXME
# Create cluster # Create cluster
ansible-playbook ${ANSIBLE_LOG_LEVEL} -e @${CI_TEST_SETTING} -e @${CI_TEST_REGISTRY_MIRROR} -e @${CI_TEST_VARS} -e local_release_dir=${PWD}/downloads --limit "all:!fake_hosts" cluster.yml ansible-playbook ${ANSIBLE_LOG_LEVEL} -e @${CI_TEST_SETTING} -e @${CI_TEST_REGISTRY_MIRROR} -e @${CI_TEST_VARS} -e local_release_dir=${PWD}/downloads --limit "all:!fake_hosts" cluster.yml