diff --git a/tests/e2e/testutils.go b/tests/e2e/testutils.go index 89b517602f6..c08eef24489 100644 --- a/tests/e2e/testutils.go +++ b/tests/e2e/testutils.go @@ -306,7 +306,7 @@ func RunCommand(cmd string) (string, error) { func UpgradeCluster(serverNodeNames []string, agentNodeNames []string) error { for _, nodeName := range serverNodeNames { - cmd := "RELEASE_CHANNEL=commit vagrant provision " + nodeName + cmd := "E2E_RELEASE_CHANNEL=commit vagrant provision " + nodeName fmt.Println(cmd) if out, err := RunCommand(cmd); err != nil { fmt.Println("Error Upgrading Cluster", out) @@ -314,7 +314,7 @@ func UpgradeCluster(serverNodeNames []string, agentNodeNames []string) error { } } for _, nodeName := range agentNodeNames { - cmd := "RELEASE_CHANNEL=commit vagrant provision " + nodeName + cmd := "E2E_RELEASE_CHANNEL=commit vagrant provision " + nodeName if _, err := RunCommand(cmd); err != nil { fmt.Println("Error Upgrading Cluster", err) return err diff --git a/tests/e2e/upgradecluster/Vagrantfile b/tests/e2e/upgradecluster/Vagrantfile index ae0120f7036..b9b794e5a4f 100644 --- a/tests/e2e/upgradecluster/Vagrantfile +++ b/tests/e2e/upgradecluster/Vagrantfile @@ -1,12 +1,13 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' -NODE_ROLES = (ENV['NODE_ROLES'] || +NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) -NODE_BOXES = (ENV['NODE_BOXES'] || +NODE_BOXES = (ENV['E2E_NODE_BOXES'] || ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) -RELEASE_CHANNEL = (ENV['RELEASE_CHANNEL'] || "latest") -RELEASE_VERSION = (ENV['RELEASE_VERSION'] || "") -NODE_CPUS = (ENV['NODE_CPUS'] || 2).to_i -NODE_MEMORY = (ENV['NODE_MEMORY'] || 1024).to_i +RELEASE_CHANNEL = (ENV['E2E_RELEASE_CHANNEL'] || "latest") +RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") +EXTERNAL_DB = (ENV['E2E_EXTERNAL_DB'] || "etcd") +NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i +NODE_MEMORY = (ENV['E2E_NODE_MEMORY'] || 1024).to_i # Virtualbox >= 6.1.28 require `/etc/vbox/network.conf` for expanded private networks NETWORK_PREFIX = "10.10.10" install_type = "" @@ -15,11 +16,13 @@ def provision(vm, role, role_num, node_num) vm.box = NODE_BOXES[node_num] vm.hostname = role # An expanded netmask is required to allow VM<-->VM communication, virtualbox defaults to /32 - vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0" + node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" + vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" + + scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" + vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" + load vagrant_defaults - vagrant_defaults = '../vagrantdefaults.rb' - load vagrant_defaults if File.exists?(vagrant_defaults) - defaultOSConfigure(vm) if !RELEASE_VERSION.empty? @@ -33,33 +36,100 @@ def provision(vm, role, role_num, node_num) install_type = "INSTALL_K3S_VERSION=$(cat\ /tmp/k3s_version)" end + + vm.provision "shell", inline: "ping -c 2 k3s.io" + db_type = getDBType(role, role_num, vm) + + if role.include?("server") && role_num == 0 - vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s| - k3s.args = %W[server --cluster-init --node-external-ip=#{NETWORK_PREFIX}.100 --flannel-iface=eth1] - k3s.env = %W[K3S_KUBECONFIG_MODE=0644 K3S_TOKEN=vagrant #{install_type}] + vm.provision 'k3s-primary-server', type: 'k3s', run: 'once' do |k3s| + k3s.args = "server " + k3s.config = <<~YAML + token: vagrant + node-external-ip: #{NETWORK_PREFIX}.100 + flannel-iface: eth1 + tls-san: #{NETWORK_PREFIX}.100.nip.io + #{db_type} + YAML + k3s.env = %W[K3S_KUBECONFIG_MODE=0644 #{install_type}] k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 end elsif role.include?("server") && role_num != 0 - vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s| - k3s.args = %W[server --server https://#{NETWORK_PREFIX}.100:6443 --flannel-iface=eth1] + vm.provision 'k3s-secondary-server', type: 'k3s', run: 'once' do |k3s| + k3s.args = "server" + k3s.config = <<~YAML + server: "https://#{NETWORK_PREFIX}.100:6443" + token: vagrant + node-external-ip: #{node_ip} + flannel-iface: eth1 + #{db_type} + YAML k3s.env = %W[K3S_KUBECONFIG_MODE=0644 K3S_TOKEN=vagrant #{install_type}] k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 end end - if role.include?("agent") - vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s| - k3s.args = %W[agent --server https://#{NETWORK_PREFIX}.100:6443 --flannel-iface=eth1] - k3s.env = %W[K3S_KUBECONFIG_MODE=0644 K3S_TOKEN=vagrant #{install_type}] + + if role.include?("agent") + vm.provision 'k3s-agent', type: 'k3s', run: 'once' do |k3s| + k3s.args = "agent" + k3s.config = <<~YAML + server: "https://#{NETWORK_PREFIX}.100:6443" + token: vagrant + node-external-ip: #{node_ip} + flannel-iface: eth1 + #{db_type} + YAML + k3s.env = %W[K3S_KUBECONFIG_MODE=0644 #{install_type}] k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 end end if vm.box.to_s.include?("microos") vm.provision 'k3s-reload', type: 'reload', run: 'once' + if !EXTERNAL_DB.empty? + vm.provision "shell", inline: "docker start #{EXTERNAL_DB}" + end end end + +def getDBType(role, role_num, vm) + + if EXTERNAL_DB == "mysql" + if role.include?("server") && role_num == 0 + dockerInstall(vm) + vm.provision "Start mysql", inline: "docker run -d -p 3306:3306 --name #{EXTERNAL_DB} -e MYSQL_ROOT_PASSWORD=e2e mysql:5.7" + vm.provision "shell", inline: "echo \"Wait for mysql to startup\"; sleep 10" + return "datastore-endpoint: 'mysql://root:e2e@tcp(#{NETWORK_PREFIX}.100:3306)/k3s'" + elsif role.include?("server") && role_num != 0 + return "datastore-endpoint: 'mysql://root:e2e@tcp(#{NETWORK_PREFIX}.100:3306)/k3s'" + end + + elsif EXTERNAL_DB == "postgres" + if role.include?("server") && role_num == 0 + dockerInstall(vm) + vm.provision "Start postgres", inline: "docker run -d -p 5432:5432 --name #{EXTERNAL_DB} -e POSTGRES_PASSWORD=e2e postgres:14-alpine" + vm.provision "shell", inline: "echo \"Wait for postgres to startup\"; sleep 10" + return "datastore-endpoint: 'postgres://postgres:e2e@#{NETWORK_PREFIX}.100:5432/k3s?sslmode=disable'" + elsif role.include?("server") && role_num != 0 + return "datastore-endpoint: 'postgres://postgres:e2e@#{NETWORK_PREFIX}.100:5432/k3s?sslmode=disable'" + end + + elsif ( EXTERNAL_DB == "" || EXTERNAL_DB == "etcd" ) + if role.include?("server") && role_num == 0 + return "cluster-init: true" + end + elsif ( EXTERNAL_DB == "none" ) + # Use internal sqlite + else + puts "Unknown EXTERNAL_DB: " + EXTERNAL_DB + abort + end + return "" +end + + Vagrant.configure("2") do |config| config.vagrant.plugins = ["vagrant-k3s", "vagrant-reload"] # Default provider is libvirt, virtualbox is only provided as a backup @@ -71,7 +141,7 @@ Vagrant.configure("2") do |config| v.cpus = NODE_CPUS v.memory = NODE_MEMORY end - + if NODE_ROLES.kind_of?(String) NODE_ROLES = NODE_ROLES.split(" ", -1) end @@ -79,7 +149,7 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating + # Must iterate on the index, vagrant does not understand iterating # over the node roles themselves NODE_ROLES.length.times do |i| name = NODE_ROLES[i] diff --git a/tests/e2e/vagrantdefaults.rb b/tests/e2e/vagrantdefaults.rb index 99404041f97..8cf23e13d12 100644 --- a/tests/e2e/vagrantdefaults.rb +++ b/tests/e2e/vagrantdefaults.rb @@ -5,6 +5,7 @@ def defaultOSConfigure(vm) vm.provision "Install jq", type: "shell", inline: "apt install -y jq" elsif box.include?("Leap") || box.include?("Tumbleweed") vm.provision "Install jq", type: "shell", inline: "zypper install -y jq" + vm.provision "Install apparmor-parser", type: "shell", inline: "zypper install -y apparmor-parser" elsif box.include?("rocky8") || box.include?("rocky9") vm.provision "Install jq", type: "shell", inline: "dnf install -y jq" vm.provision "Disable firewall", type: "shell", inline: "systemctl stop firewalld"