[CI] kube 1.24 requires at least 1775Mi of memory, might as well leav…

…e the default of 2048
oomichi · Jun 15, 2022 · 5dc8be9 · 5dc8be9
1 parent fad2966
commit 5dc8be9
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 $num_instances = 16
-$vm_memory ||= 1600
+$vm_memory ||= 2048
 $os = "ubuntu1804"
 $network_plugin = "weave"
 $kube_master_instances = 1