From 5dc8be9aa2a60070be56e2d7fec3b3ea4654e263 Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Mon, 6 Jun 2022 22:28:22 +0300
Subject: [PATCH] [CI] kube 1.24 requires at least 1775Mi of memory, might as
 well leave the default of 2048

---
 tests/files/packet_ubuntu18-aio-docker.yml                 | 1 -
 tests/files/packet_ubuntu18-calico-aio.yml                 | 1 -
 tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml | 1 -
 tests/files/packet_ubuntu18-calico-ha-recover.yml          | 1 -
 tests/files/packet_ubuntu18-flannel-ha-once.yml            | 1 -
 tests/files/packet_ubuntu18-flannel-ha.yml                 | 1 -
 tests/files/packet_ubuntu20-aio-docker.yml                 | 1 -
 tests/files/packet_ubuntu20-calico-aio.yml                 | 1 -
 tests/files/packet_ubuntu20-calico-ha-wireguard.yml        | 1 -
 tests/files/vagrant_ubuntu18-weave-medium.rb               | 2 +-
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/tests/files/packet_ubuntu18-aio-docker.yml b/tests/files/packet_ubuntu18-aio-docker.yml
index 548ff371e..3fd06f2fa 100644
--- a/tests/files/packet_ubuntu18-aio-docker.yml
+++ b/tests/files/packet_ubuntu18-aio-docker.yml
@@ -2,7 +2,6 @@
 # Instance settings
 cloud_image: ubuntu-1804
 mode: aio
-vm_memory: 1600Mi
 
 # Use docker
 container_manager: docker
diff --git a/tests/files/packet_ubuntu18-calico-aio.yml b/tests/files/packet_ubuntu18-calico-aio.yml
index 66ac1e074..df9e42809 100644
--- a/tests/files/packet_ubuntu18-calico-aio.yml
+++ b/tests/files/packet_ubuntu18-calico-aio.yml
@@ -2,4 +2,3 @@
 # Instance settings
 cloud_image: ubuntu-1804
 mode: aio
-vm_memory: 1600Mi
diff --git a/tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml b/tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml
index cdf689a96..a064392d6 100644
--- a/tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml
+++ b/tests/files/packet_ubuntu18-calico-ha-recover-noquorum.yml
@@ -2,4 +2,3 @@
 # Instance settings
 cloud_image: ubuntu-1804
 mode: ha-recover-noquorum
-vm_memory: 1600Mi
diff --git a/tests/files/packet_ubuntu18-calico-ha-recover.yml b/tests/files/packet_ubuntu18-calico-ha-recover.yml
index d53b3a7bb..b1ef3b913 100644
--- a/tests/files/packet_ubuntu18-calico-ha-recover.yml
+++ b/tests/files/packet_ubuntu18-calico-ha-recover.yml
@@ -2,4 +2,3 @@
 # Instance settings
 cloud_image: ubuntu-1804
 mode: ha-recover
-vm_memory: 1600Mi
diff --git a/tests/files/packet_ubuntu18-flannel-ha-once.yml b/tests/files/packet_ubuntu18-flannel-ha-once.yml
index 6ac229b0c..fe672891d 100644
--- a/tests/files/packet_ubuntu18-flannel-ha-once.yml
+++ b/tests/files/packet_ubuntu18-flannel-ha-once.yml
@@ -2,7 +2,6 @@
 # Instance settings
 cloud_image: ubuntu-1804
 mode: ha
-vm_memory: 1600Mi
 
 # Kubespray settings
 kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085
diff --git a/tests/files/packet_ubuntu18-flannel-ha.yml b/tests/files/packet_ubuntu18-flannel-ha.yml
index 6ac229b0c..fe672891d 100644
--- a/tests/files/packet_ubuntu18-flannel-ha.yml
+++ b/tests/files/packet_ubuntu18-flannel-ha.yml
@@ -2,7 +2,6 @@
 # Instance settings
 cloud_image: ubuntu-1804
 mode: ha
-vm_memory: 1600Mi
 
 # Kubespray settings
 kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085
diff --git a/tests/files/packet_ubuntu20-aio-docker.yml b/tests/files/packet_ubuntu20-aio-docker.yml
index 4089a6605..edc12207c 100644
--- a/tests/files/packet_ubuntu20-aio-docker.yml
+++ b/tests/files/packet_ubuntu20-aio-docker.yml
@@ -2,7 +2,6 @@
 # Instance settings
 cloud_image: ubuntu-2004
 mode: aio
-vm_memory: 1600Mi
 
 # Kubespray settings
 auto_renew_certificates: true
diff --git a/tests/files/packet_ubuntu20-calico-aio.yml b/tests/files/packet_ubuntu20-calico-aio.yml
index 80be03207..41d4a1315 100644
--- a/tests/files/packet_ubuntu20-calico-aio.yml
+++ b/tests/files/packet_ubuntu20-calico-aio.yml
@@ -2,7 +2,6 @@
 # Instance settings
 cloud_image: ubuntu-2004
 mode: aio
-vm_memory: 1600Mi
 
 # Kubespray settings
 auto_renew_certificates: true
diff --git a/tests/files/packet_ubuntu20-calico-ha-wireguard.yml b/tests/files/packet_ubuntu20-calico-ha-wireguard.yml
index 5c3ab83e0..f2e2f57d0 100644
--- a/tests/files/packet_ubuntu20-calico-ha-wireguard.yml
+++ b/tests/files/packet_ubuntu20-calico-ha-wireguard.yml
@@ -2,7 +2,6 @@
 # Instance settings
 cloud_image: ubuntu-2004
 mode: ha
-vm_memory: 1600Mi
 
 # Kubespray settings
 calico_wireguard_enabled: true
diff --git a/tests/files/vagrant_ubuntu18-weave-medium.rb b/tests/files/vagrant_ubuntu18-weave-medium.rb
index ae16510c3..be537f645 100644
--- a/tests/files/vagrant_ubuntu18-weave-medium.rb
+++ b/tests/files/vagrant_ubuntu18-weave-medium.rb
@@ -1,5 +1,5 @@
 $num_instances = 16
-$vm_memory ||= 1600
+$vm_memory ||= 2048
 $os = "ubuntu1804"
 $network_plugin = "weave"
 $kube_master_instances = 1
-- 
GitLab