diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go index 4307f719cf50..4abc4899a537 100644 --- a/pkg/cli/cmds/agent.go +++ b/pkg/cli/cmds/agent.go @@ -269,14 +269,14 @@ func NewAgentCommand(action func(ctx *cli.Context) error) cli.Command { FlannelCniConfFileFlag, ExtraKubeletArgs, ExtraKubeProxyArgs, + // Experimental flags cli.BoolFlag{ Name: "rootless", Usage: "(experimental) Run rootless", Destination: &AgentConfig.Rootless, }, - + PreferBundledBin, // Deprecated/hidden below - &DisableSELinuxFlag, DockerFlag, FlannelFlag, diff --git a/pkg/cli/cmds/root.go b/pkg/cli/cmds/root.go index eece55ac5b1c..2fa4dae4468a 100644 --- a/pkg/cli/cmds/root.go +++ b/pkg/cli/cmds/root.go @@ -17,6 +17,10 @@ var ( Destination: &Debug, EnvVar: version.ProgramUpper + "_DEBUG", } + PreferBundledBin = cli.BoolFlag{ + Name: "prefer-bundled-bin", + Usage: "(experimental) Prefer bundled userspace binaries over host binaries", + } ) func init() { diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index 0257e7ebe669..b0023e5a56ef 100644 --- a/pkg/cli/cmds/server.go +++ b/pkg/cli/cmds/server.go @@ -508,16 +508,13 @@ var ServerFlags = []cli.Flag{ Usage: "(experimental) Run rootless", Destination: &ServerConfig.Rootless, }, + PreferBundledBin, cli.StringFlag{ Name: "system-default-registry", Usage: "(image) Private registry to be used for all system images", EnvVar: version.ProgramUpper + "_SYSTEM_DEFAULT_REGISTRY", Destination: &ServerConfig.SystemDefaultRegistry, }, - cli.BoolFlag{ - Name: "prefer-bundled-bin", - Usage: "(experimental) Prefer bundled userspace binaries over host binaries", - }, &SELinuxFlag, LBServerPortFlag, diff --git a/tests/e2e/preferbundled/Vagrantfile b/tests/e2e/preferbundled/Vagrantfile new file mode 100644 index 000000000000..9d0cf433bad3 --- /dev/null +++ b/tests/e2e/preferbundled/Vagrantfile @@ -0,0 +1,87 @@ +ENV['VAGRANT_NO_PARALLEL'] = 'no' +NODE_ROLES = (ENV['NODE_ROLES'] || + ["server-0", "agent-0"]) +NODE_BOXES = (ENV['NODE_BOXES'] || + ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) +GITHUB_BRANCH = (ENV['GITHUB_BRANCH'] || "master") +RELEASE_VERSION = (ENV['RELEASE_VERSION'] || "") +NODE_CPUS = (ENV['NODE_CPUS'] || 2).to_i +NODE_MEMORY = (ENV['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 = "" + +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" + + vagrant_defaults = '../vagrantdefaults.rb' + load vagrant_defaults if File.exists?(vagrant_defaults) + + defaultOSConfigure(vm) + install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH) + + vm.provision "shell", inline: "ping -c 2 k3s.io" + + if role.include?("server") + vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s| + k3s.args = "server" + k3s.env = %W[K3S_KUBECONFIG_MODE=0644 #{install_type}] + k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 + k3s.config = <<~YAML + token: vagrant + flannel-iface: eth1 + node-external-ip: #{NETWORK_PREFIX}.100 + prefer-bundled-bin: true + YAML + end + elsif role.include?("agent") + vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s| + k3s.args = "agent" + 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 + k3s.config = <<~YAML + server: "https://#{NETWORK_PREFIX}.100:6443" + token: vagrant + flannel-iface: eth1 + prefer-bundled-bin: true + YAML + end + end + + if vm.box.to_s.include?("microos") + vm.provision 'k3s-reload', type: 'reload', run: 'once' + end +end + +Vagrant.configure("2") do |config| + config.vagrant.plugins = ["vagrant-k3s", "vagrant-reload"] + # Default provider is libvirt, virtualbox is only provided as a backup + config.vm.provider "libvirt" do |v| + v.cpus = NODE_CPUS + v.memory = NODE_MEMORY + end + config.vm.provider "virtualbox" do |v| + v.cpus = NODE_CPUS + v.memory = NODE_MEMORY + end + + if NODE_ROLES.kind_of?(String) + NODE_ROLES = NODE_ROLES.split(" ", -1) + end + if NODE_BOXES.kind_of?(String) + NODE_BOXES = NODE_BOXES.split(" ", -1) + end + + # 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] + role_num = name.split("-", -1).pop.to_i + config.vm.define name do |node| + provision(node.vm, name, role_num, i) + end + end +end diff --git a/tests/e2e/preferbundled/preferbundled_test.go b/tests/e2e/preferbundled/preferbundled_test.go new file mode 100644 index 000000000000..3679399477e9 --- /dev/null +++ b/tests/e2e/preferbundled/preferbundled_test.go @@ -0,0 +1,92 @@ +package preferbundled + +import ( + "flag" + "fmt" + "os" + "strings" + "testing" + + "github.com/k3s-io/k3s/tests/e2e" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64, dweomer/microos.amd64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var serverCount = flag.Int("serverCount", 1, "number of server nodes") +var agentCount = flag.Int("agentCount", 1, "number of agent nodes") + +// Environment Variables Info: +// E2E_RELEASE_VERSION=v1.23.1+k3s2 or nil for latest commit from master + +func Test_E2EPreferBundled(t *testing.T) { + RegisterFailHandler(Fail) + flag.Parse() + suiteConfig, reporterConfig := GinkgoConfiguration() + RunSpecs(t, "Prefer Bundled Binaries Test Suite", suiteConfig, reporterConfig) +} + +var ( + kubeConfigFile string + serverNodeNames []string + agentNodeNames []string +) + +var _ = ReportAfterEach(e2e.GenReport) + +var _ = Describe("Verify prefer-bundled-bin flag", Ordered, func() { + Context("Cluster :", func() { + It("Starts up with no issues", func() { + var err error + serverNodeNames, agentNodeNames, err = e2e.CreateCluster(*nodeOS, *serverCount, *agentCount) + Expect(err).NotTo(HaveOccurred(), e2e.GetVagrantLog(err)) + fmt.Println("CLUSTER CONFIG") + fmt.Println("OS:", *nodeOS) + fmt.Println("Server Nodes:", serverNodeNames) + fmt.Println("Agent Nodes:", agentNodeNames) + kubeConfigFile, err = e2e.GenKubeConfigFile(serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred()) + }) + + It("Checks node and pod status", func() { + fmt.Printf("\nFetching node status\n") + Eventually(func(g Gomega) { + nodes, err := e2e.ParseNodes(kubeConfigFile, false) + g.Expect(err).NotTo(HaveOccurred()) + for _, node := range nodes { + g.Expect(node.Status).Should(Equal("Ready")) + } + }, "420s", "5s").Should(Succeed()) + _, _ = e2e.ParseNodes(kubeConfigFile, true) + + fmt.Printf("\nFetching pods status\n") + Eventually(func(g Gomega) { + pods, err := e2e.ParsePods(kubeConfigFile, false) + g.Expect(err).NotTo(HaveOccurred()) + for _, pod := range pods { + if strings.Contains(pod.Name, "helm-install") { + g.Expect(pod.Status).Should(Equal("Completed"), pod.Name) + } else { + g.Expect(pod.Status).Should(Equal("Running"), pod.Name) + } + } + }, "420s", "5s").Should(Succeed()) + _, _ = e2e.ParsePods(kubeConfigFile, true) + }) + }) +}) + +var failed bool +var _ = AfterEach(func() { + failed = failed || CurrentSpecReport().Failed() +}) + +var _ = AfterSuite(func() { + if failed { + fmt.Println("FAILED!") + } else { + Expect(e2e.DestroyCluster()).To(Succeed()) + Expect(os.Remove(kubeConfigFile)).To(Succeed()) + } +})