Unverified Commit 116c977f authored by Derek Nola's avatar Derek Nola Committed by GitHub

Convert vagrant tests to yaml based config (#5992)

parent 30fc9095
...@@ -61,12 +61,16 @@ EOF ...@@ -61,12 +61,16 @@ EOF
test.vm.provision 'k3s-install', type: 'k3s', run: ENV['CI'] == 'true' ? 'never' : 'once' do |k3s| test.vm.provision 'k3s-install', type: 'k3s', run: ENV['CI'] == 'true' ? 'never' : 'once' do |k3s|
k3s.args = %w[server] k3s.args = %w[server]
k3s.env = %w[INSTALL_K3S_NAME=server INSTALL_K3S_SKIP_DOWNLOAD=true K3S_TOKEN=vagrant INSTALL_K3S_SKIP_ENABLE=true] k3s.env = %w[INSTALL_K3S_NAME=server INSTALL_K3S_SKIP_DOWNLOAD=true K3S_TOKEN=vagrant INSTALL_K3S_SKIP_ENABLE=true]
k3s.config = { k3s.config = <<~YAML
'disable' => %w[local-storage metrics-server servicelb traefik], disable:
'disable-helm-controller' => true, - local-storage
'disable-network-policy' => true, - metrics-server
'write-kubeconfig-mode' => '0644', - servicelb
} - traefik
disable-helm-controller: true
disable-network-policy: true
write-kubeconfig-mode: '0644'
YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
test.vm.provision "k3s-start", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| test.vm.provision "k3s-start", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
......
...@@ -21,10 +21,10 @@ Vagrant.configure("2") do |config| ...@@ -21,10 +21,10 @@ Vagrant.configure("2") do |config|
k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({ k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({
:INSTALL_K3S_NAME => 'server', :INSTALL_K3S_NAME => 'server',
}) })
k3s.config = { k3s.config = <<~YAML
:selinux => true, selinux: true
:token => 'vagrant', token: 'vagrant'
} YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
......
...@@ -21,10 +21,10 @@ Vagrant.configure("2") do |config| ...@@ -21,10 +21,10 @@ Vagrant.configure("2") do |config|
k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({ k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({
:INSTALL_K3S_NAME => 'server', :INSTALL_K3S_NAME => 'server',
}) })
k3s.config = { k3s.config = <<~YAML
:selinux => true, selinux: true
:token => 'vagrant', token: 'vagrant'
} YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
......
...@@ -24,9 +24,9 @@ Vagrant.configure("2") do |config| ...@@ -24,9 +24,9 @@ Vagrant.configure("2") do |config|
:INSTALL_K3S_NAME => 'server', :INSTALL_K3S_NAME => 'server',
:INSTALL_K3S_SKIP_SELINUX_RPM => 'true', :INSTALL_K3S_SKIP_SELINUX_RPM => 'true',
}) })
k3s.config = { k3s.config = <<~YAML
:token => 'vagrant', token: 'vagrant'
} YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
......
...@@ -22,10 +22,10 @@ Vagrant.configure("2") do |config| ...@@ -22,10 +22,10 @@ Vagrant.configure("2") do |config|
k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({ k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({
:INSTALL_K3S_NAME => 'server', :INSTALL_K3S_NAME => 'server',
}) })
k3s.config = { k3s.config = <<~YAML
:selinux => true, selinux: true
:token => 'vagrant', token: 'vagrant'
} YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
# install.sh will move the snapshot forward when installing k3s-selinux policy, so, we reboot to pick that up # install.sh will move the snapshot forward when installing k3s-selinux policy, so, we reboot to pick that up
......
...@@ -22,10 +22,10 @@ Vagrant.configure("2") do |config| ...@@ -22,10 +22,10 @@ Vagrant.configure("2") do |config|
k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({ k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({
:INSTALL_K3S_NAME => 'server', :INSTALL_K3S_NAME => 'server',
}) })
k3s.config = { k3s.config = <<~YAML
:selinux => true, selinux: true
:token => 'vagrant', token: 'vagrant'
} YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
......
...@@ -22,9 +22,9 @@ Vagrant.configure("2") do |config| ...@@ -22,9 +22,9 @@ Vagrant.configure("2") do |config|
:INSTALL_K3S_NAME => 'server', :INSTALL_K3S_NAME => 'server',
:INSTALL_K3S_SKIP_SELINUX_RPM => 'true', :INSTALL_K3S_SKIP_SELINUX_RPM => 'true',
}) })
k3s.config = { k3s.config = <<~YAML
:token => 'vagrant', token: 'vagrant'
} YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
......
...@@ -46,12 +46,16 @@ Vagrant.configure("2") do |config| ...@@ -46,12 +46,16 @@ Vagrant.configure("2") do |config|
test.vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s| test.vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s|
k3s.args = %w[server --snapshotter=btrfs] k3s.args = %w[server --snapshotter=btrfs]
k3s.env = %w[INSTALL_K3S_NAME=server INSTALL_K3S_SKIP_DOWNLOAD=true K3S_TOKEN=vagrant] k3s.env = %w[INSTALL_K3S_NAME=server INSTALL_K3S_SKIP_DOWNLOAD=true K3S_TOKEN=vagrant]
k3s.config = { k3s.config = <<~YAML
'disable' => %w[local-storage metrics-server servicelb traefik], disable:
'disable-helm-controller' => true, - local-storage
'disable-network-policy' => true, - metrics-server
'write-kubeconfig-mode' => '0644', - servicelb
} - traefik
disable-helm-controller: true
disable-network-policy: true
write-kubeconfig-mode: '0644'
YAML
k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
end end
test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment