From 02624554aeb841a1f951a3dc0d76e3e20204fa16 Mon Sep 17 00:00:00 2001 From: Arthur Outhenin-Chalandre Date: Thu, 25 May 2023 04:56:50 +0200 Subject: [PATCH] Remove end of life ubuntu versions in CI (#10107) * tests: replace ubuntu16 with ubuntu20 Signed-off-by: Arthur Outhenin-Chalandre * tests: replace ubuntu18 with ubuntu20 Signed-off-by: Arthur Outhenin-Chalandre * docs: update docs to remove support for ubuntu 16 and 18 Signed-off-by: Arthur Outhenin-Chalandre * molecule: upgrade ubuntu versions Signed-off-by: Arthur Outhenin-Chalandre * vagrant: upgrade ubuntu versions Signed-off-by: Arthur Outhenin-Chalandre * tests: cleanup ubuntu{16,18} Signed-off-by: Arthur Outhenin-Chalandre * tests: increase ubuntu22 ram to allow molecule creation Signed-off-by: Arthur Outhenin-Chalandre --------- Signed-off-by: Arthur Outhenin-Chalandre --- .gitlab-ci/packet.yml | 29 +++++-------------- .gitlab-ci/terraform.yml | 26 ++++------------- .gitlab-ci/vagrant.yml | 13 +++------ README.md | 2 +- Vagrantfile | 9 +++--- docs/ci.md | 12 ++------ .../molecule/default/molecule.yml | 12 +++----- .../molecule/default/molecule.yml | 8 ++--- .../roles/kubevirt-images/defaults/main.yml | 14 --------- .../roles/packet-ci/defaults/main.yml | 2 -- tests/files/packet_ubuntu18-aio-docker.yml | 9 ------ tests/files/packet_ubuntu18-calico-aio.yml | 4 --- tests/files/packet_ubuntu18-flannel-ha.yml | 24 --------------- ...t_ubuntu20-calico-ha-recover-noquorum.yml} | 2 +- ... => packet_ubuntu20-calico-ha-recover.yml} | 2 +- ...sep.yml => packet_ubuntu20-cilium-sep.yml} | 2 +- ...tu18-crio.yml => packet_ubuntu20-crio.yml} | 2 +- ...l => packet_ubuntu20-docker-weave-sep.yml} | 2 +- ...ml => packet_ubuntu20-flannel-ha-once.yml} | 2 +- ...-ha.yml => packet_ubuntu20-flannel-ha.yml} | 2 +- ...lico.yml => tf-elastx_ubuntu20-calico.yml} | 0 ...-calico.yml => tf-ovh_ubuntu20-calico.yml} | 0 tests/files/vagrant_ubuntu18-flannel.rb | 7 ----- tests/files/vagrant_ubuntu18-flannel.yml | 3 -- ... => vagrant_ubuntu20-calico-dual-stack.rb} | 0 ...=> vagrant_ubuntu20-calico-dual-stack.yml} | 0 ...rb => vagrant_ubuntu20-kube-router-sep.rb} | 2 +- ...l => vagrant_ubuntu20-kube-router-sep.yml} | 2 +- ...vagrant_ubuntu20-kube-router-svc-proxy.rb} | 2 +- ...agrant_ubuntu20-kube-router-svc-proxy.yml} | 2 +- ...um.rb => vagrant_ubuntu20-weave-medium.rb} | 2 +- ....yml => vagrant_ubuntu20-weave-medium.yml} | 0 32 files changed, 45 insertions(+), 153 deletions(-) delete mode 100644 tests/files/packet_ubuntu18-aio-docker.yml delete mode 100644 tests/files/packet_ubuntu18-calico-aio.yml delete mode 100644 tests/files/packet_ubuntu18-flannel-ha.yml rename tests/files/{packet_ubuntu18-calico-ha-recover-noquorum.yml => packet_ubuntu20-calico-ha-recover-noquorum.yml} (66%) rename tests/files/{packet_ubuntu18-calico-ha-recover.yml => packet_ubuntu20-calico-ha-recover.yml} (62%) rename tests/files/{packet_ubuntu18-cilium-sep.yml => packet_ubuntu20-cilium-sep.yml} (85%) rename tests/files/{packet_ubuntu18-crio.yml => packet_ubuntu20-crio.yml} (84%) rename tests/files/{packet_ubuntu16-docker-weave-sep.yml => packet_ubuntu20-docker-weave-sep.yml} (92%) rename tests/files/{packet_ubuntu18-flannel-ha-once.yml => packet_ubuntu20-flannel-ha-once.yml} (96%) rename tests/files/{packet_ubuntu16-flannel-ha.yml => packet_ubuntu20-flannel-ha.yml} (90%) rename tests/files/{tf-elastx_ubuntu18-calico.yml => tf-elastx_ubuntu20-calico.yml} (100%) rename tests/files/{tf-ovh_ubuntu18-calico.yml => tf-ovh_ubuntu20-calico.yml} (100%) delete mode 100644 tests/files/vagrant_ubuntu18-flannel.rb delete mode 100644 tests/files/vagrant_ubuntu18-flannel.yml rename tests/files/{vagrant_ubuntu18-calico-dual-stack.rb => vagrant_ubuntu20-calico-dual-stack.rb} (100%) rename tests/files/{vagrant_ubuntu18-calico-dual-stack.yml => vagrant_ubuntu20-calico-dual-stack.yml} (100%) rename tests/files/{vagrant_ubuntu16-kube-router-sep.rb => vagrant_ubuntu20-kube-router-sep.rb} (95%) rename tests/files/{vagrant_ubuntu16-kube-router-sep.yml => vagrant_ubuntu20-kube-router-sep.yml} (82%) rename tests/files/{vagrant_ubuntu16-kube-router-svc-proxy.rb => vagrant_ubuntu20-kube-router-svc-proxy.rb} (93%) rename tests/files/{vagrant_ubuntu16-kube-router-svc-proxy.yml => vagrant_ubuntu20-kube-router-svc-proxy.yml} (85%) rename tests/files/{vagrant_ubuntu18-weave-medium.rb => vagrant_ubuntu20-weave-medium.rb} (89%) rename tests/files/{vagrant_ubuntu18-weave-medium.yml => vagrant_ubuntu20-weave-medium.yml} (100%) diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml index bbee73905..a25fbd2e8 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/packet.yml @@ -41,11 +41,6 @@ packet_ubuntu20-calico-aio-ansible-2_11: # ### PR JOBS PART2 -packet_ubuntu18-aio-docker: - stage: deploy-part2 - extends: .packet_pr - when: on_success - packet_ubuntu20-aio-docker: stage: deploy-part2 extends: .packet_pr @@ -56,11 +51,6 @@ packet_ubuntu20-calico-aio-hardening: extends: .packet_pr when: on_success -packet_ubuntu18-calico-aio: - stage: deploy-part2 - extends: .packet_pr - when: on_success - packet_ubuntu22-aio-docker: stage: deploy-part2 extends: .packet_pr @@ -81,7 +71,7 @@ packet_almalinux8-crio: stage: deploy-part2 when: on_success -packet_ubuntu18-crio: +packet_ubuntu20-crio: extends: .packet_pr stage: deploy-part2 when: manual @@ -91,7 +81,7 @@ packet_fedora35-crio: stage: deploy-part2 when: manual -packet_ubuntu16-flannel-ha: +packet_ubuntu20-flannel-ha: stage: deploy-part2 extends: .packet_pr when: manual @@ -175,22 +165,17 @@ packet_opensuse-docker-cilium: # ### MANUAL JOBS -packet_ubuntu16-docker-weave-sep: +packet_ubuntu20-docker-weave-sep: stage: deploy-part2 extends: .packet_pr when: manual -packet_ubuntu18-cilium-sep: +packet_ubuntu20-cilium-sep: stage: deploy-special extends: .packet_pr when: manual -packet_ubuntu18-flannel-ha: - stage: deploy-part2 - extends: .packet_pr - when: manual - -packet_ubuntu18-flannel-ha-once: +packet_ubuntu20-flannel-ha-once: stage: deploy-part2 extends: .packet_pr when: manual @@ -308,7 +293,7 @@ packet_debian11-calico-upgrade-once: variables: UPGRADE_TEST: graceful -packet_ubuntu18-calico-ha-recover: +packet_ubuntu20-calico-ha-recover: stage: deploy-part3 extends: .packet_periodic when: on_success @@ -316,7 +301,7 @@ packet_ubuntu18-calico-ha-recover: RECOVER_CONTROL_PLANE_TEST: "true" RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:],kube_control_plane[1:]" -packet_ubuntu18-calico-ha-recover-noquorum: +packet_ubuntu20-calico-ha-recover-noquorum: stage: deploy-part3 extends: .packet_periodic when: on_success diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml index ffdd226ed..e72f2868d 100644 --- a/.gitlab-ci/terraform.yml +++ b/.gitlab-ci/terraform.yml @@ -100,21 +100,7 @@ tf-validate-upcloud: PROVIDER: upcloud CLUSTER: $CI_COMMIT_REF_NAME -# tf-packet-ubuntu16-default: -# extends: .terraform_apply -# variables: -# TF_VERSION: $TERRAFORM_VERSION -# PROVIDER: packet -# CLUSTER: $CI_COMMIT_REF_NAME -# TF_VAR_number_of_k8s_masters: "1" -# TF_VAR_number_of_k8s_nodes: "1" -# TF_VAR_plan_k8s_masters: t1.small.x86 -# TF_VAR_plan_k8s_nodes: t1.small.x86 -# TF_VAR_metro: ny -# TF_VAR_public_key_path: "" -# TF_VAR_operating_system: ubuntu_16_04 -# -# tf-packet-ubuntu18-default: +# tf-packet-ubuntu20-default: # extends: .terraform_apply # variables: # TF_VERSION: $TERRAFORM_VERSION @@ -126,7 +112,7 @@ tf-validate-upcloud: # TF_VAR_plan_k8s_nodes: t1.small.x86 # TF_VAR_metro: am # TF_VAR_public_key_path: "" -# TF_VAR_operating_system: ubuntu_18_04 +# TF_VAR_operating_system: ubuntu_20_04 .ovh_variables: &ovh_variables OS_AUTH_URL: https://auth.cloud.ovh.net/v3 @@ -164,7 +150,7 @@ tf-elastx_cleanup: script: - ./scripts/openstack-cleanup/main.py -tf-elastx_ubuntu18-calico: +tf-elastx_ubuntu20-calico: extends: .terraform_apply stage: deploy-part3 when: on_success @@ -194,7 +180,7 @@ tf-elastx_ubuntu18-calico: TF_VAR_az_list_node: '["sto1"]' TF_VAR_flavor_k8s_master: 3f73fc93-ec61-4808-88df-2580d94c1a9b # v1-standard-2 TF_VAR_flavor_k8s_node: 3f73fc93-ec61-4808-88df-2580d94c1a9b # v1-standard-2 - TF_VAR_image: ubuntu-18.04-server-latest + TF_VAR_image: ubuntu-20.04-server-latest TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]' # OVH voucher expired, commenting job until things are sorted out @@ -211,7 +197,7 @@ tf-elastx_ubuntu18-calico: # script: # - ./scripts/openstack-cleanup/main.py -# tf-ovh_ubuntu18-calico: +# tf-ovh_ubuntu20-calico: # extends: .terraform_apply # when: on_success # environment: ovh @@ -237,5 +223,5 @@ tf-elastx_ubuntu18-calico: # TF_VAR_network_name: "Ext-Net" # TF_VAR_flavor_k8s_master: "defa64c3-bd46-43b4-858a-d93bbae0a229" # s1-8 # TF_VAR_flavor_k8s_node: "defa64c3-bd46-43b4-858a-d93bbae0a229" # s1-8 -# TF_VAR_image: "Ubuntu 18.04" +# TF_VAR_image: "Ubuntu 20.04" # TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]' diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml index 52aec6c78..e7dbf73ff 100644 --- a/.gitlab-ci/vagrant.yml +++ b/.gitlab-ci/vagrant.yml @@ -24,17 +24,12 @@ - chronic ./tests/scripts/testcases_cleanup.sh allow_failure: true -vagrant_ubuntu18-calico-dual-stack: +vagrant_ubuntu20-calico-dual-stack: stage: deploy-part2 extends: .vagrant when: on_success -vagrant_ubuntu18-flannel: - stage: deploy-part2 - extends: .vagrant - when: on_success - -vagrant_ubuntu18-weave-medium: +vagrant_ubuntu20-weave-medium: stage: deploy-part2 extends: .vagrant when: manual @@ -50,13 +45,13 @@ vagrant_ubuntu20-flannel-collection: extends: .vagrant when: on_success -vagrant_ubuntu16-kube-router-sep: +vagrant_ubuntu20-kube-router-sep: stage: deploy-part2 extends: .vagrant when: manual # Service proxy test fails connectivity testing -vagrant_ubuntu16-kube-router-svc-proxy: +vagrant_ubuntu20-kube-router-svc-proxy: stage: deploy-part2 extends: .vagrant when: manual diff --git a/README.md b/README.md index a8dc76f5f..878700850 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ vagrant up - **Flatcar Container Linux by Kinvolk** - **Debian** Bullseye, Buster -- **Ubuntu** 16.04, 18.04, 20.04, 22.04 +- **Ubuntu** 20.04, 22.04 - **CentOS/RHEL** 7, [8, 9](docs/centos.md#centos-8) - **Fedora** 35, 36 - **Fedora CoreOS** (see [fcos Note](docs/fcos.md)) diff --git a/Vagrantfile b/Vagrantfile index a3cf28d49..42666b3c7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -20,9 +20,8 @@ SUPPORTED_OS = { "flatcar-beta" => {box: "flatcar-beta", user: "core", box_url: FLATCAR_URL_TEMPLATE % ["beta"]}, "flatcar-alpha" => {box: "flatcar-alpha", user: "core", box_url: FLATCAR_URL_TEMPLATE % ["alpha"]}, "flatcar-edge" => {box: "flatcar-edge", user: "core", box_url: FLATCAR_URL_TEMPLATE % ["edge"]}, - "ubuntu1604" => {box: "generic/ubuntu1604", user: "vagrant"}, - "ubuntu1804" => {box: "generic/ubuntu1804", user: "vagrant"}, "ubuntu2004" => {box: "generic/ubuntu2004", user: "vagrant"}, + "ubuntu2204" => {box: "generic/ubuntu2204", user: "vagrant"}, "centos" => {box: "centos/7", user: "vagrant"}, "centos-bento" => {box: "bento/centos-7.6", user: "vagrant"}, "centos8" => {box: "centos/8", user: "vagrant"}, @@ -54,7 +53,7 @@ $shared_folders ||= {} $forwarded_ports ||= {} $subnet ||= "172.18.8" $subnet_ipv6 ||= "fd3c:b398:0698:0756" -$os ||= "ubuntu1804" +$os ||= "ubuntu2004" $network_plugin ||= "flannel" # Setting multi_networking to true will install Multus: https://github.com/k8snetworkplumbingwg/multus-cni $multi_networking ||= "False" @@ -219,8 +218,8 @@ Vagrant.configure("2") do |config| # Disable swap for each vm node.vm.provision "shell", inline: "swapoff -a" - # ubuntu1804 and ubuntu2004 have IPv6 explicitly disabled. This undoes that. - if ["ubuntu1804", "ubuntu2004"].include? $os + # ubuntu2004 and ubuntu2204 have IPv6 explicitly disabled. This undoes that. + if ["ubuntu2004", "ubuntu2204"].include? $os node.vm.provision "shell", inline: "rm -f /etc/modprobe.d/local.conf" node.vm.provision "shell", inline: "sed -i '/net.ipv6.conf.all.disable_ipv6/d' /etc/sysctl.d/99-sysctl.conf /etc/sysctl.conf" end diff --git a/docs/ci.md b/docs/ci.md index 67d87ff18..59fcc0788 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -16,9 +16,7 @@ fedora36 | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu16 | :x: | :x: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | -ubuntu18 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | -ubuntu20 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | +ubuntu20 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ## crio @@ -35,9 +33,7 @@ fedora36 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu22 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ## docker @@ -54,7 +50,5 @@ fedora36 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_chec opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu16 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | -ubuntu18 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/roles/bootstrap-os/molecule/default/molecule.yml b/roles/bootstrap-os/molecule/default/molecule.yml index 22e322ebe..3e89ec26d 100644 --- a/roles/bootstrap-os/molecule/default/molecule.yml +++ b/roles/bootstrap-os/molecule/default/molecule.yml @@ -9,18 +9,14 @@ driver: provider: name: libvirt platforms: - - name: ubuntu16 - box: generic/ubuntu1604 - cpus: 1 - memory: 512 - - name: ubuntu18 - box: generic/ubuntu1804 - cpus: 1 - memory: 512 - name: ubuntu20 box: generic/ubuntu2004 cpus: 1 memory: 512 + - name: ubuntu22 + box: generic/ubuntu2204 + cpus: 1 + memory: 1024 - name: centos7 box: centos/7 cpus: 1 diff --git a/roles/container-engine/kata-containers/molecule/default/molecule.yml b/roles/container-engine/kata-containers/molecule/default/molecule.yml index 63a942b99..dd2b24751 100644 --- a/roles/container-engine/kata-containers/molecule/default/molecule.yml +++ b/roles/container-engine/kata-containers/molecule/default/molecule.yml @@ -9,15 +9,15 @@ lint: | set -e yamllint -c ../../../.yamllint . platforms: - - name: ubuntu18 - box: generic/ubuntu1804 + - name: ubuntu20 + box: generic/ubuntu2004 cpus: 1 memory: 1024 nested: true groups: - kube_control_plane - - name: ubuntu20 - box: generic/ubuntu2004 + - name: ubuntu22 + box: generic/ubuntu2204 cpus: 1 memory: 1024 nested: true diff --git a/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml b/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml index 5b38495be..123f3980d 100644 --- a/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml +++ b/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml @@ -6,20 +6,6 @@ docker_host: quay.io registry: quay.io/kubespray images: - ubuntu-1604: - filename: xenial-server-cloudimg-amd64-disk1.img - url: https://storage.googleapis.com/kubespray-images/ubuntu/xenial-server-cloudimg-amd64-disk1.img - checksum: sha256:c0d099383cd064390b568e20d1c39a9c68ba864764404b70f754a7b1b2f808f7 - converted: false - tag: "latest" - - ubuntu-1804: - filename: bionic-server-cloudimg-amd64.img - url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img - checksum: sha256:c3d0e03f4245ffaabd7647e6dabf346b944a62b9934d0a89f3a04b4236386af2 - converted: false - tag: "latest" - ubuntu-2004: filename: focal-server-cloudimg-amd64.img url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64-disk-kvm.img diff --git a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml index f2c82368e..2c487fb2b 100644 --- a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml +++ b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml @@ -36,8 +36,6 @@ cloud_init: opensuse-leap-15: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" rhel-server-7: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IHJoZWwKdXNlcnM6CiAtIG5hbWU6IGt1YmVzcHJheQogICBncm91cHM6IHdoZWVsCiAgIHN1ZG86ICdBTEw9KEFMTCkgTk9QQVNTV0Q6QUxMJwogICBzaGVsbDogL2Jpbi9iYXNoCiAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICBob21lOiAvaG9tZS9rdWJlc3ByYXkKICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1Cgo=" amazon-linux-2: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IHJoZWwKdXNlcnM6CiAtIG5hbWU6IGt1YmVzcHJheQogICBncm91cHM6IHdoZWVsCiAgIHN1ZG86ICdBTEw9KEFMTCkgTk9QQVNTV0Q6QUxMJwogICBzaGVsbDogL2Jpbi9iYXNoCiAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICBob21lOiAvaG9tZS9rdWJlc3ByYXkKICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1Cgo=" - ubuntu-1604: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" - ubuntu-1804: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" ubuntu-2004: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" ubuntu-2204: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" oracle-7: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IHJoZWwKdXNlcnM6CiAtIG5hbWU6IGt1YmVzcHJheQogICBncm91cHM6IHdoZWVsCiAgIHN1ZG86ICdBTEw9KEFMTCkgTk9QQVNTV0Q6QUxMJwogICBzaGVsbDogL2Jpbi9iYXNoCiAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICBob21lOiAvaG9tZS9rdWJlc3ByYXkKICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1Cgo=" diff --git a/tests/files/packet_ubuntu18-aio-docker.yml b/tests/files/packet_ubuntu18-aio-docker.yml deleted file mode 100644 index 3fd06f2fa..000000000 --- a/tests/files/packet_ubuntu18-aio-docker.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-1804 -mode: aio - -# Use docker -container_manager: docker -etcd_deployment_type: docker -resolvconf_mode: docker_dns diff --git a/tests/files/packet_ubuntu18-calico-aio.yml b/tests/files/packet_ubuntu18-calico-aio.yml deleted file mode 100644 index df9e42809..000000000 --- a/tests/files/packet_ubuntu18-calico-aio.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-1804 -mode: aio diff --git a/tests/files/packet_ubuntu18-flannel-ha.yml b/tests/files/packet_ubuntu18-flannel-ha.yml deleted file mode 100644 index cc513d010..000000000 --- a/tests/files/packet_ubuntu18-flannel-ha.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -# Instance settings -cloud_image: ubuntu-1804 -mode: ha - -# Kubespray settings -kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085 -kube_proxy_mode: iptables -kube_network_plugin: flannel -helm_enabled: true -krew_enabled: true -kubernetes_audit: true -etcd_events_cluster_enabled: true -local_volume_provisioner_enabled: true -kube_encrypt_secret_data: true -ingress_nginx_enabled: true -ingress_nginx_webhook_enabled: true -ingress_nginx_webhook_job_ttl: 30 -cert_manager_enabled: true -# Disable as health checks are still unstable and slow to respond. -metrics_server_enabled: false -metrics_server_kubelet_insecure_tls: true -kube_token_auth: true -enable_nodelocaldns: false diff --git a/tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml b/tests/files/packet_ubuntu20-calico-ha-recover-noquorum.yml similarity index 66% rename from tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml rename to tests/files/packet_ubuntu20-calico-ha-recover-noquorum.yml index a064392d6..2d6db360e 100644 --- a/tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml +++ b/tests/files/packet_ubuntu20-calico-ha-recover-noquorum.yml @@ -1,4 +1,4 @@ --- # Instance settings -cloud_image: ubuntu-1804 +cloud_image: ubuntu-2004 mode: ha-recover-noquorum diff --git a/tests/files/packet_ubuntu18-calico-ha-recover.yml b/tests/files/packet_ubuntu20-calico-ha-recover.yml similarity index 62% rename from tests/files/packet_ubuntu18-calico-ha-recover.yml rename to tests/files/packet_ubuntu20-calico-ha-recover.yml index b1ef3b913..a757719ad 100644 --- a/tests/files/packet_ubuntu18-calico-ha-recover.yml +++ b/tests/files/packet_ubuntu20-calico-ha-recover.yml @@ -1,4 +1,4 @@ --- # Instance settings -cloud_image: ubuntu-1804 +cloud_image: ubuntu-2004 mode: ha-recover diff --git a/tests/files/packet_ubuntu18-cilium-sep.yml b/tests/files/packet_ubuntu20-cilium-sep.yml similarity index 85% rename from tests/files/packet_ubuntu18-cilium-sep.yml rename to tests/files/packet_ubuntu20-cilium-sep.yml index 04ed4cc80..104f7c395 100644 --- a/tests/files/packet_ubuntu18-cilium-sep.yml +++ b/tests/files/packet_ubuntu20-cilium-sep.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-1804 +cloud_image: ubuntu-2004 mode: separate # Kubespray settings diff --git a/tests/files/packet_ubuntu18-crio.yml b/tests/files/packet_ubuntu20-crio.yml similarity index 84% rename from tests/files/packet_ubuntu18-crio.yml rename to tests/files/packet_ubuntu20-crio.yml index f5b7e127d..87329d058 100644 --- a/tests/files/packet_ubuntu18-crio.yml +++ b/tests/files/packet_ubuntu20-crio.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-1804 +cloud_image: ubuntu-2004 mode: default # Kubespray settings diff --git a/tests/files/packet_ubuntu16-docker-weave-sep.yml b/tests/files/packet_ubuntu20-docker-weave-sep.yml similarity index 92% rename from tests/files/packet_ubuntu16-docker-weave-sep.yml rename to tests/files/packet_ubuntu20-docker-weave-sep.yml index 9b268e77e..8c6584caa 100644 --- a/tests/files/packet_ubuntu16-docker-weave-sep.yml +++ b/tests/files/packet_ubuntu20-docker-weave-sep.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-1604 +cloud_image: ubuntu-2004 mode: separate # Kubespray settings diff --git a/tests/files/packet_ubuntu18-flannel-ha-once.yml b/tests/files/packet_ubuntu20-flannel-ha-once.yml similarity index 96% rename from tests/files/packet_ubuntu18-flannel-ha-once.yml rename to tests/files/packet_ubuntu20-flannel-ha-once.yml index fe672891d..4477421fd 100644 --- a/tests/files/packet_ubuntu18-flannel-ha-once.yml +++ b/tests/files/packet_ubuntu20-flannel-ha-once.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-1804 +cloud_image: ubuntu-2004 mode: ha # Kubespray settings diff --git a/tests/files/packet_ubuntu16-flannel-ha.yml b/tests/files/packet_ubuntu20-flannel-ha.yml similarity index 90% rename from tests/files/packet_ubuntu16-flannel-ha.yml rename to tests/files/packet_ubuntu20-flannel-ha.yml index 8df48e35a..06a9ffb24 100644 --- a/tests/files/packet_ubuntu16-flannel-ha.yml +++ b/tests/files/packet_ubuntu20-flannel-ha.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-1604 +cloud_image: ubuntu-2004 mode: ha # Kubespray settings diff --git a/tests/files/tf-elastx_ubuntu18-calico.yml b/tests/files/tf-elastx_ubuntu20-calico.yml similarity index 100% rename from tests/files/tf-elastx_ubuntu18-calico.yml rename to tests/files/tf-elastx_ubuntu20-calico.yml diff --git a/tests/files/tf-ovh_ubuntu18-calico.yml b/tests/files/tf-ovh_ubuntu20-calico.yml similarity index 100% rename from tests/files/tf-ovh_ubuntu18-calico.yml rename to tests/files/tf-ovh_ubuntu20-calico.yml diff --git a/tests/files/vagrant_ubuntu18-flannel.rb b/tests/files/vagrant_ubuntu18-flannel.rb deleted file mode 100644 index ce942edbb..000000000 --- a/tests/files/vagrant_ubuntu18-flannel.rb +++ /dev/null @@ -1,7 +0,0 @@ -# For CI we are not worries about data persistence across reboot -$libvirt_volume_cache = "unsafe" - -# Checking for box update can trigger API rate limiting -# https://www.vagrantup.com/docs/vagrant-cloud/request-limits.html -$box_check_update = false -$vm_cpus = 2 diff --git a/tests/files/vagrant_ubuntu18-flannel.yml b/tests/files/vagrant_ubuntu18-flannel.yml deleted file mode 100644 index 6f8916feb..000000000 --- a/tests/files/vagrant_ubuntu18-flannel.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# Kubespray settings -kube_network_plugin: flannel diff --git a/tests/files/vagrant_ubuntu18-calico-dual-stack.rb b/tests/files/vagrant_ubuntu20-calico-dual-stack.rb similarity index 100% rename from tests/files/vagrant_ubuntu18-calico-dual-stack.rb rename to tests/files/vagrant_ubuntu20-calico-dual-stack.rb diff --git a/tests/files/vagrant_ubuntu18-calico-dual-stack.yml b/tests/files/vagrant_ubuntu20-calico-dual-stack.yml similarity index 100% rename from tests/files/vagrant_ubuntu18-calico-dual-stack.yml rename to tests/files/vagrant_ubuntu20-calico-dual-stack.yml diff --git a/tests/files/vagrant_ubuntu16-kube-router-sep.rb b/tests/files/vagrant_ubuntu20-kube-router-sep.rb similarity index 95% rename from tests/files/vagrant_ubuntu16-kube-router-sep.rb rename to tests/files/vagrant_ubuntu20-kube-router-sep.rb index c10093439..999f8132e 100644 --- a/tests/files/vagrant_ubuntu16-kube-router-sep.rb +++ b/tests/files/vagrant_ubuntu20-kube-router-sep.rb @@ -1,6 +1,6 @@ $num_instances = 2 $vm_memory ||= 2048 -$os = "ubuntu1604" +$os = "ubuntu2004" $kube_master_instances = 1 $etcd_instances = 1 diff --git a/tests/files/vagrant_ubuntu16-kube-router-sep.yml b/tests/files/vagrant_ubuntu20-kube-router-sep.yml similarity index 82% rename from tests/files/vagrant_ubuntu16-kube-router-sep.yml rename to tests/files/vagrant_ubuntu20-kube-router-sep.yml index e2c60b3cc..d17b627a7 100644 --- a/tests/files/vagrant_ubuntu16-kube-router-sep.yml +++ b/tests/files/vagrant_ubuntu20-kube-router-sep.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-1604 +cloud_image: ubuntu-2004 mode: separate # Kubespray settings diff --git a/tests/files/vagrant_ubuntu16-kube-router-svc-proxy.rb b/tests/files/vagrant_ubuntu20-kube-router-svc-proxy.rb similarity index 93% rename from tests/files/vagrant_ubuntu16-kube-router-svc-proxy.rb rename to tests/files/vagrant_ubuntu20-kube-router-svc-proxy.rb index 51fd024c3..29f6e8166 100644 --- a/tests/files/vagrant_ubuntu16-kube-router-svc-proxy.rb +++ b/tests/files/vagrant_ubuntu20-kube-router-svc-proxy.rb @@ -1,4 +1,4 @@ -$os = "ubuntu1604" +$os = "ubuntu2004" # For CI we are not worried about data persistence across reboot $libvirt_volume_cache = "unsafe" diff --git a/tests/files/vagrant_ubuntu16-kube-router-svc-proxy.yml b/tests/files/vagrant_ubuntu20-kube-router-svc-proxy.yml similarity index 85% rename from tests/files/vagrant_ubuntu16-kube-router-svc-proxy.yml rename to tests/files/vagrant_ubuntu20-kube-router-svc-proxy.yml index 465d42da7..faa30d068 100644 --- a/tests/files/vagrant_ubuntu16-kube-router-svc-proxy.yml +++ b/tests/files/vagrant_ubuntu20-kube-router-svc-proxy.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: ubuntu-1604 +cloud_image: ubuntu-2004 mode: separate # Kubespray settings diff --git a/tests/files/vagrant_ubuntu18-weave-medium.rb b/tests/files/vagrant_ubuntu20-weave-medium.rb similarity index 89% rename from tests/files/vagrant_ubuntu18-weave-medium.rb rename to tests/files/vagrant_ubuntu20-weave-medium.rb index be537f645..6cf49c95f 100644 --- a/tests/files/vagrant_ubuntu18-weave-medium.rb +++ b/tests/files/vagrant_ubuntu20-weave-medium.rb @@ -1,6 +1,6 @@ $num_instances = 16 $vm_memory ||= 2048 -$os = "ubuntu1804" +$os = "ubuntu2004" $network_plugin = "weave" $kube_master_instances = 1 $etcd_instances = 1 diff --git a/tests/files/vagrant_ubuntu18-weave-medium.yml b/tests/files/vagrant_ubuntu20-weave-medium.yml similarity index 100% rename from tests/files/vagrant_ubuntu18-weave-medium.yml rename to tests/files/vagrant_ubuntu20-weave-medium.yml