From c9bff141527d8dc1cc122cfbedcf9ce7c95e499a Mon Sep 17 00:00:00 2001 From: Ian Cardoso Date: Mon, 8 May 2023 05:25:47 -0300 Subject: [PATCH 1/5] add private registry e2e test Signed-off-by: Ian Cardoso --- tests/e2e/README.md | 8 + tests/e2e/privateregistry/Vagrantfile | 152 +++++++++++++++++ .../privateregistry/privateregistry_test.go | 160 ++++++++++++++++++ 3 files changed, 320 insertions(+) create mode 100644 tests/e2e/privateregistry/Vagrantfile create mode 100644 tests/e2e/privateregistry/privateregistry_test.go diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 5dbbf084e5d3..a186dcfd4c48 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -49,6 +49,14 @@ Install the necessary vagrant plugins with the following command: ```bash vagrant plugin install vagrant-libvirt vagrant-scp vagrant-k3s vagrant-reload ``` +### Kubectl + +For linux +```bash + curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" + sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl +``` +If it does not work, or you are on a different system, check the [official tutorial](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/) ## Running diff --git a/tests/e2e/privateregistry/Vagrantfile b/tests/e2e/privateregistry/Vagrantfile new file mode 100644 index 000000000000..d759179e2050 --- /dev/null +++ b/tests/e2e/privateregistry/Vagrantfile @@ -0,0 +1,152 @@ +ENV['VAGRANT_NO_PARALLEL'] = 'no' +NODE_ROLES = (ENV['E2E_NODE_ROLES'] || + ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) +NODE_BOXES = (ENV['E2E_NODE_BOXES'] || + ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) +GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") +RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") +EXTERNAL_DB = (ENV['E2E_EXTERNAL_DB'] || "etcd") +HARDENED = (ENV['E2E_HARDENED'] || "") +REGISTRY = (ENV['E2E_REGISTRY'] || "") +RANCHER = (ENV['E2E_RANCHER'] || "") +NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i +NODE_MEMORY = (ENV['E2E_NODE_MEMORY'] || 2048).to_i +# Virtualbox >= 6.1.28 require `/etc/vbox/network.conf` for expanded private networks +NETWORK_PREFIX = "10.10.10" +install_type = "" +hardened_arg = "" + +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 + 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 + + defaultOSConfigure(vm) + install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH) + + vm.provision "shell", inline: "ping -c 2 k3s.io" + + hardened_arg = getHardenedArg(vm, HARDENED, scripts_location) + + writePrivateRegistry = <<-'SCRIPT' + mkdir -p /etc/rancher/k3s/ + echo "mirrors: + server-0.local: + endpoint: + - \"http://server-0.local:5000\"" >> /etc/rancher/k3s/registries.yaml + SCRIPT + + + + setInsecureRegistryPolicy = <<-'SCRIPT' + mkdir -p /etc/docker/ + echo "{ + \"insecure-registries\" : [\"server-0.local:5000\"] + }" >> /etc/docker/daemon.json + SCRIPT + setEtcHost = <<-'SCRIPT' + echo "10.10.10.100 server-0" >> /etc/hosts + sudo systemctl daemon-reload + sudo systemctl restart docker + SCRIPT + + if role.include?("server") && role_num == 0 + dockerInstall(vm) + vm.provision "shell", inline: writePrivateRegistry + vm.provision "shell", inline: setInsecureRegistryPolicy + 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 + cluster-init: true + #{hardened_arg} + 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 "shell", inline: setInsecureRegistryPolicy + vm.provision "shell", inline: setEtcHost + 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 + #{hardened_arg} + 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") + dockerInstall(vm) + vm.provision "shell", inline: setInsecureRegistryPolicy + vm.provision "shell", inline: setEtcHost + + 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 + 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 + # This step does not run by default and is designed to be called by higher level tools + if !RANCHER.empty? + blank_node = role.include?("agent") + vm.provision "Install Rancher", type: "shell", run: "never", path: scripts_location + "/rancher.sh", args: [ "#{NETWORK_PREFIX}.100", blank_node.to_s ] + 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/privateregistry/privateregistry_test.go b/tests/e2e/privateregistry/privateregistry_test.go new file mode 100644 index 000000000000..71216718cd98 --- /dev/null +++ b/tests/e2e/privateregistry/privateregistry_test.go @@ -0,0 +1,160 @@ +package validatecluster + +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, generic/centos7, generic/rocky8, +// opensuse/Leap-15.3.x86_64 +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") +var ci = flag.Bool("ci", false, "running on CI") +var local = flag.Bool("local", false, "deploy a locally built K3s binary") + +// Environment Variables Info: +// E2E_EXTERNAL_DB: mysql, postgres, etcd (default: etcd) +// E2E_RELEASE_VERSION=v1.23.1+k3s2 (default: latest commit from master) +// E2E_REGISTRY: true/false (default: false) + +func Test_E2EPrivateRegistry(t *testing.T) { + RegisterFailHandler(Fail) + flag.Parse() + suiteConfig, reporterConfig := GinkgoConfiguration() + RunSpecs(t, "Create Cluster Test Suite", suiteConfig, reporterConfig) +} + +var ( + kubeConfigFile string + serverNodeNames []string + agentNodeNames []string +) + +var _ = ReportAfterEach(e2e.GenReport) + +var _ = Describe("Verify Create", Ordered, func() { + Context("Cluster :", func() { + It("Starts up with no issues", func() { + var err error + if *local { + serverNodeNames, agentNodeNames, err = e2e.CreateLocalCluster(*nodeOS, *serverCount, *agentCount) + } else { + 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")) + } + }, "620s", "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) + } + } + }, "620s", "5s").Should(Succeed()) + _, _ = e2e.ParsePods(kubeConfigFile, true) + }) + + It("Create new private registry", func() { + registry, err := e2e.RunCmdOnNode("sudo docker run -d -p 5000:5000 --restart=always --name registry registry:2 ", serverNodeNames[0]) + fmt.Println(registry) + Expect(err).NotTo(HaveOccurred()) + + }) + It("ensures registry is working", func() { + a, err := e2e.RunCmdOnNode("sudo docker ps -a | grep registry\n", serverNodeNames[0]) + fmt.Println(a) + Expect(err).NotTo(HaveOccurred()) + + }) + It("Should pull and image from dockerhub and send it to private registry", func() { + pull, err := e2e.RunCmdOnNode("sudo docker pull hello-world", serverNodeNames[0]) + fmt.Println(pull) + Expect(err).NotTo(HaveOccurred()) + tag, err := e2e.RunCmdOnNode("sudo docker tag hello-world server-0.local:5000/my-hello-world", serverNodeNames[0]) + fmt.Println(tag) + Expect(err).NotTo(HaveOccurred()) + push, err := e2e.RunCmdOnNode("sudo docker push server-0.local:5000/my-hello-world", serverNodeNames[0]) + fmt.Println(push) + Expect(err).NotTo(HaveOccurred()) + rm, err := e2e.RunCmdOnNode("sudo docker image remove hello-world server-0.local:5000/my-hello-world", serverNodeNames[0]) + fmt.Println(rm) + + Expect(err).NotTo(HaveOccurred()) + }) + It("Should create and validate deployment with private registry on", func() { + + cmd, err := e2e.RunCmdOnNode("sudo kubectl create deployment my-hello-world --image=server-0.local:5000/my-hello-world", serverNodeNames[0]) + fmt.Println(cmd) + Expect(err).NotTo(HaveOccurred()) + + Eventually(func(g Gomega) { + pods, err := e2e.ParsePods(kubeConfigFile, false) + g.Expect(err).NotTo(HaveOccurred()) + foundHelloWorld := false + for _, pod := range pods { + if strings.Contains(pod.Name, "helm-install") { + g.Expect(pod.Status).Should(Equal("Completed"), pod.Name) + } else { + if strings.Contains(pod.Name, "hello-world") { + foundHelloWorld = true + } + g.Expect(pod.Status).Should(Equal("Completed"), pod.Name) + } + } + g.Expect(foundHelloWorld).Should(Equal(true)) + }, "60s", "5s").Should(Succeed()) + _, _ = e2e.ParsePods(kubeConfigFile, true) + }) + + }) +}) + +var failed bool +var _ = AfterEach(func() { + failed = failed || CurrentSpecReport().Failed() +}) + +var _ = AfterSuite(func() { + //r1, err := e2e.RunCmdOnNode("sudo docker rm -f registry", serverNodeNames[0]) + //fmt.Println(r1) + //Expect(err).NotTo(HaveOccurred()) + //r2, err := e2e.RunCmdOnNode("sudo kubectl delete deployment my-hello-world", serverNodeNames[0]) + //fmt.Println(r2) + //Expect(err).NotTo(HaveOccurred()) + if failed && !*ci { + fmt.Println("FAILED!") + } else { + Expect(e2e.DestroyCluster()).To(Succeed()) + Expect(os.Remove(kubeConfigFile)).To(Succeed()) + } +}) From edfb4dffa9349201171ddced924a29ce5bfdf51d Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Wed, 31 May 2023 12:09:54 -0700 Subject: [PATCH 2/5] Fixes to registry deployment Signed-off-by: Derek Nola --- .../multiclustercidr/multiclustercidr_test.go | 4 +- tests/e2e/privateregistry/Vagrantfile | 44 +++++---------- .../privateregistry/privateregistry_test.go | 53 +++++++++---------- tests/e2e/testutils.go | 30 +++++++---- 4 files changed, 60 insertions(+), 71 deletions(-) diff --git a/tests/e2e/multiclustercidr/multiclustercidr_test.go b/tests/e2e/multiclustercidr/multiclustercidr_test.go index 09b95fabc70b..fc31cd96d1d0 100644 --- a/tests/e2e/multiclustercidr/multiclustercidr_test.go +++ b/tests/e2e/multiclustercidr/multiclustercidr_test.go @@ -143,7 +143,7 @@ var _ = Describe("Verify MultiClusterCIDR Configuration", Ordered, func() { Expect(err).NotTo(HaveOccurred()) for _, pod := range pods { if pod.Node == "agent-0" { - Expect(pod.NodeIP).Should(Or(ContainSubstring("10.10.10"), ContainSubstring("10.248.")), pod.Name) + Expect(pod.IP).Should(Or(ContainSubstring("10.10.10"), ContainSubstring("10.248.")), pod.Name) } } }) @@ -260,7 +260,7 @@ var _ = Describe("Verify MultiClusterCIDR Configuration", Ordered, func() { Expect(err).NotTo(HaveOccurred()) for _, pod := range pods { if pod.Node == "agent-0" { - Expect(pod.NodeIP).Should(Or(ContainSubstring("fd11:decf:c0ff"), ContainSubstring("2001:cafe:248")), pod.Name) + Expect(pod.IP).Should(Or(ContainSubstring("fd11:decf:c0ff"), ContainSubstring("2001:cafe:248")), pod.Name) } } }) diff --git a/tests/e2e/privateregistry/Vagrantfile b/tests/e2e/privateregistry/Vagrantfile index d759179e2050..4f2b55e2c76a 100644 --- a/tests/e2e/privateregistry/Vagrantfile +++ b/tests/e2e/privateregistry/Vagrantfile @@ -6,15 +6,11 @@ NODE_BOXES = (ENV['E2E_NODE_BOXES'] || GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") EXTERNAL_DB = (ENV['E2E_EXTERNAL_DB'] || "etcd") -HARDENED = (ENV['E2E_HARDENED'] || "") -REGISTRY = (ENV['E2E_REGISTRY'] || "") -RANCHER = (ENV['E2E_RANCHER'] || "") NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i NODE_MEMORY = (ENV['E2E_NODE_MEMORY'] || 2048).to_i # Virtualbox >= 6.1.28 require `/etc/vbox/network.conf` for expanded private networks NETWORK_PREFIX = "10.10.10" install_type = "" -hardened_arg = "" def provision(vm, role, role_num, node_num) vm.box = NODE_BOXES[node_num] @@ -32,34 +28,28 @@ def provision(vm, role, role_num, node_num) vm.provision "shell", inline: "ping -c 2 k3s.io" - hardened_arg = getHardenedArg(vm, HARDENED, scripts_location) - writePrivateRegistry = <<-'SCRIPT' - mkdir -p /etc/rancher/k3s/ - echo "mirrors: - server-0.local: - endpoint: - - \"http://server-0.local:5000\"" >> /etc/rancher/k3s/registries.yaml + mkdir -p /etc/rancher/k3s/ + echo "mirrors: + server-0.local: + endpoint: + - \"http://server-0.local:5000\"" >> /etc/rancher/k3s/registries.yaml SCRIPT - - setInsecureRegistryPolicy = <<-'SCRIPT' - mkdir -p /etc/docker/ - echo "{ - \"insecure-registries\" : [\"server-0.local:5000\"] - }" >> /etc/docker/daemon.json + mkdir -p /etc/docker/ + echo "{ \"insecure-registries\" : [\"server-0.local:5000\"] }" >> /etc/docker/daemon.json SCRIPT + setEtcHost = <<-'SCRIPT' - echo "10.10.10.100 server-0" >> /etc/hosts - sudo systemctl daemon-reload - sudo systemctl restart docker + echo "10.10.10.100 server-0.local" >> /etc/hosts SCRIPT if role.include?("server") && role_num == 0 - dockerInstall(vm) - vm.provision "shell", inline: writePrivateRegistry vm.provision "shell", inline: setInsecureRegistryPolicy + vm.provision "shell", inline: writePrivateRegistry + dockerInstall(vm) + vm.provision 'k3s-primary-server', type: 'k3s', run: 'once' do |k3s| k3s.args = "server " k3s.config = <<~YAML @@ -67,7 +57,6 @@ def provision(vm, role, role_num, node_num) node-external-ip: #{NETWORK_PREFIX}.100 flannel-iface: eth1 cluster-init: true - #{hardened_arg} YAML k3s.env = %W[K3S_KUBECONFIG_MODE=0644 #{install_type}] k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 @@ -83,7 +72,6 @@ def provision(vm, role, role_num, node_num) token: vagrant node-external-ip: #{node_ip} flannel-iface: eth1 - #{hardened_arg} 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 @@ -91,8 +79,7 @@ def provision(vm, role, role_num, node_num) end if role.include?("agent") - dockerInstall(vm) - vm.provision "shell", inline: setInsecureRegistryPolicy + vm.provision "shell", inline: writePrivateRegistry vm.provision "shell", inline: setEtcHost vm.provision 'k3s-agent', type: 'k3s', run: 'once' do |k3s| @@ -113,11 +100,6 @@ def provision(vm, role, role_num, node_num) vm.provision "shell", inline: "docker start #{EXTERNAL_DB}" end end - # This step does not run by default and is designed to be called by higher level tools - if !RANCHER.empty? - blank_node = role.include?("agent") - vm.provision "Install Rancher", type: "shell", run: "never", path: scripts_location + "/rancher.sh", args: [ "#{NETWORK_PREFIX}.100", blank_node.to_s ] - end end diff --git a/tests/e2e/privateregistry/privateregistry_test.go b/tests/e2e/privateregistry/privateregistry_test.go index 71216718cd98..74d195c16bf1 100644 --- a/tests/e2e/privateregistry/privateregistry_test.go +++ b/tests/e2e/privateregistry/privateregistry_test.go @@ -97,43 +97,42 @@ var _ = Describe("Verify Create", Ordered, func() { }) It("Should pull and image from dockerhub and send it to private registry", func() { - pull, err := e2e.RunCmdOnNode("sudo docker pull hello-world", serverNodeNames[0]) - fmt.Println(pull) - Expect(err).NotTo(HaveOccurred()) - tag, err := e2e.RunCmdOnNode("sudo docker tag hello-world server-0.local:5000/my-hello-world", serverNodeNames[0]) - fmt.Println(tag) - Expect(err).NotTo(HaveOccurred()) - push, err := e2e.RunCmdOnNode("sudo docker push server-0.local:5000/my-hello-world", serverNodeNames[0]) - fmt.Println(push) - Expect(err).NotTo(HaveOccurred()) - rm, err := e2e.RunCmdOnNode("sudo docker image remove hello-world server-0.local:5000/my-hello-world", serverNodeNames[0]) - fmt.Println(rm) + cmd := "sudo docker pull nginx" + _, err := e2e.RunCmdOnNode(cmd, serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) - Expect(err).NotTo(HaveOccurred()) + cmd = "sudo docker tag nginx server-0.local:5000/my-webpage" + _, err = e2e.RunCmdOnNode(cmd, serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) + + cmd = "sudo docker push server-0.local:5000/my-webpage" + _, err = e2e.RunCmdOnNode(cmd, serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) + + cmd = "sudo docker image remove nginx server-0.local:5000/my-webpage" + _, err = e2e.RunCmdOnNode(cmd, serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) }) It("Should create and validate deployment with private registry on", func() { - - cmd, err := e2e.RunCmdOnNode("sudo kubectl create deployment my-hello-world --image=server-0.local:5000/my-hello-world", serverNodeNames[0]) - fmt.Println(cmd) + res, err := e2e.RunCmdOnNode("sudo kubectl create deployment my-webpage --image=server-0.local/my-webpage", serverNodeNames[0]) + fmt.Println(res) Expect(err).NotTo(HaveOccurred()) + var pod e2e.Pod Eventually(func(g Gomega) { pods, err := e2e.ParsePods(kubeConfigFile, false) - g.Expect(err).NotTo(HaveOccurred()) - foundHelloWorld := false - for _, pod := range pods { - if strings.Contains(pod.Name, "helm-install") { - g.Expect(pod.Status).Should(Equal("Completed"), pod.Name) - } else { - if strings.Contains(pod.Name, "hello-world") { - foundHelloWorld = true - } - g.Expect(pod.Status).Should(Equal("Completed"), pod.Name) + for _, p := range pods { + if strings.Contains(p.Name, "my-webpage") { + pod = p } } - g.Expect(foundHelloWorld).Should(Equal(true)) + g.Expect(err).NotTo(HaveOccurred()) + g.Expect(pod.Status).Should(Equal("Running")) + g.Expect(pod.Node).Should(Equal(agentNodeNames[0])) }, "60s", "5s").Should(Succeed()) - _, _ = e2e.ParsePods(kubeConfigFile, true) + + cmd := "curl " + pod.IP + Expect(e2e.RunCmdOnNode(cmd, serverNodeNames[0])).To(ContainSubstring("Welcome to nginx!")) }) }) diff --git a/tests/e2e/testutils.go b/tests/e2e/testutils.go index 16325bac8367..0908e7f1bcdd 100644 --- a/tests/e2e/testutils.go +++ b/tests/e2e/testutils.go @@ -35,7 +35,7 @@ type Pod struct { Ready string Status string Restarts string - NodeIP string + IP string Node string } @@ -384,16 +384,10 @@ func ParseNodes(kubeConfig string, print bool) ([]Node, error) { return nodes, nil } -func ParsePods(kubeConfig string, print bool) ([]Pod, error) { +func formatPods(input string) ([]Pod, error) { pods := make([]Pod, 0, 10) - podList := "" - - cmd := "kubectl get pods -o wide --no-headers -A --kubeconfig=" + kubeConfig - res, _ := RunCommand(cmd) - res = strings.TrimSpace(res) - podList = res - - split := strings.Split(res, "\n") + input = strings.TrimSpace(input) + split := strings.Split(input, "\n") for _, rec := range split { fields := strings.Fields(string(rec)) if len(fields) < 8 { @@ -405,11 +399,25 @@ func ParsePods(kubeConfig string, print bool) ([]Pod, error) { Ready: fields[2], Status: fields[3], Restarts: fields[4], - NodeIP: fields[6], + IP: fields[6], Node: fields[7], } pods = append(pods, pod) } + return pods, nil +} + +func ParsePods(kubeConfig string, print bool) ([]Pod, error) { + podList := "" + + cmd := "kubectl get pods -o wide --no-headers -A" + res, _ := RunCommand(cmd) + podList = strings.TrimSpace(res) + + pods, err := formatPods(res) + if err != nil { + return nil, err + } if print { fmt.Println(podList) } From a16bee16e74dfcc4d60c92eb626abd8ef52f7d5f Mon Sep 17 00:00:00 2001 From: Ian Cardoso Date: Wed, 31 May 2023 17:08:46 -0300 Subject: [PATCH 3/5] uncomment and fix AfterSuite step Signed-off-by: Ian Cardoso --- tests/e2e/privateregistry/privateregistry_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/e2e/privateregistry/privateregistry_test.go b/tests/e2e/privateregistry/privateregistry_test.go index 74d195c16bf1..21315de454b0 100644 --- a/tests/e2e/privateregistry/privateregistry_test.go +++ b/tests/e2e/privateregistry/privateregistry_test.go @@ -144,12 +144,12 @@ var _ = AfterEach(func() { }) var _ = AfterSuite(func() { - //r1, err := e2e.RunCmdOnNode("sudo docker rm -f registry", serverNodeNames[0]) - //fmt.Println(r1) - //Expect(err).NotTo(HaveOccurred()) - //r2, err := e2e.RunCmdOnNode("sudo kubectl delete deployment my-hello-world", serverNodeNames[0]) - //fmt.Println(r2) - //Expect(err).NotTo(HaveOccurred()) + r1, err := e2e.RunCmdOnNode("sudo docker rm -f registry", serverNodeNames[0]) + fmt.Println(r1) + Expect(err).NotTo(HaveOccurred()) + r2, err := e2e.RunCmdOnNode("sudo kubectl delete deployment my-webpage", serverNodeNames[0]) + fmt.Println(r2) + Expect(err).NotTo(HaveOccurred()) if failed && !*ci { fmt.Println("FAILED!") } else { From 35bfd6f3f58d0bf2c536061401369d8af05e0ac9 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Wed, 31 May 2023 13:13:30 -0700 Subject: [PATCH 4/5] Switched from named to IP for private registry Signed-off-by: Derek Nola --- tests/e2e/privateregistry/Vagrantfile | 29 +++++++++---------- .../privateregistry/privateregistry_test.go | 11 ++++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/e2e/privateregistry/Vagrantfile b/tests/e2e/privateregistry/Vagrantfile index 4f2b55e2c76a..c2120d74a8c6 100644 --- a/tests/e2e/privateregistry/Vagrantfile +++ b/tests/e2e/privateregistry/Vagrantfile @@ -27,27 +27,25 @@ def provision(vm, role, role_num, node_num) install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH) vm.provision "shell", inline: "ping -c 2 k3s.io" - - writePrivateRegistry = <<-'SCRIPT' + + # The formatting on this is a little weird, but it allows inserting variables + # and still using the heredoc formatting with escapped quotes + writePrivateRegistry = <<~'SCRIPT'.chomp % {net: NETWORK_PREFIX} mkdir -p /etc/rancher/k3s/ echo "mirrors: - server-0.local: - endpoint: - - \"http://server-0.local:5000\"" >> /etc/rancher/k3s/registries.yaml + my-registry.local: + endpoint: + - \"http://%{net}.100:5000\"" > /etc/rancher/k3s/registries.yaml SCRIPT - setInsecureRegistryPolicy = <<-'SCRIPT' + setInsecureRegistryPolicy = <<~'SCRIPT'.chomp % {net: NETWORK_PREFIX} mkdir -p /etc/docker/ - echo "{ \"insecure-registries\" : [\"server-0.local:5000\"] }" >> /etc/docker/daemon.json - SCRIPT - - setEtcHost = <<-'SCRIPT' - echo "10.10.10.100 server-0.local" >> /etc/hosts + echo "{ \"insecure-registries\" : [\"%{net}.100:5000\"] }" > /etc/docker/daemon.json SCRIPT if role.include?("server") && role_num == 0 - vm.provision "shell", inline: setInsecureRegistryPolicy - vm.provision "shell", inline: writePrivateRegistry + vm.provision "insecure-registry", type: "shell", inline: setInsecureRegistryPolicy + vm.provision "private-registry", type: "shell", inline: writePrivateRegistry dockerInstall(vm) vm.provision 'k3s-primary-server', type: 'k3s', run: 'once' do |k3s| @@ -63,8 +61,8 @@ def provision(vm, role, role_num, node_num) end elsif role.include?("server") && role_num != 0 - vm.provision "shell", inline: setInsecureRegistryPolicy - vm.provision "shell", inline: setEtcHost + vm.provision "shell", inline: writePrivateRegistry + vm.provision 'k3s-secondary-server', type: 'k3s', run: 'once' do |k3s| k3s.args = "server" k3s.config = <<~YAML @@ -80,7 +78,6 @@ def provision(vm, role, role_num, node_num) if role.include?("agent") vm.provision "shell", inline: writePrivateRegistry - vm.provision "shell", inline: setEtcHost vm.provision 'k3s-agent', type: 'k3s', run: 'once' do |k3s| k3s.args = "agent" diff --git a/tests/e2e/privateregistry/privateregistry_test.go b/tests/e2e/privateregistry/privateregistry_test.go index 21315de454b0..2b779de00882 100644 --- a/tests/e2e/privateregistry/privateregistry_test.go +++ b/tests/e2e/privateregistry/privateregistry_test.go @@ -101,20 +101,23 @@ var _ = Describe("Verify Create", Ordered, func() { _, err := e2e.RunCmdOnNode(cmd, serverNodeNames[0]) Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) - cmd = "sudo docker tag nginx server-0.local:5000/my-webpage" + nodeIP, err := e2e.FetchNodeExternalIP(serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred()) + + cmd = "sudo docker tag nginx " + nodeIP + ":5000/my-webpage" _, err = e2e.RunCmdOnNode(cmd, serverNodeNames[0]) Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) - cmd = "sudo docker push server-0.local:5000/my-webpage" + cmd = "sudo docker push " + nodeIP + ":5000/my-webpage" _, err = e2e.RunCmdOnNode(cmd, serverNodeNames[0]) Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) - cmd = "sudo docker image remove nginx server-0.local:5000/my-webpage" + cmd = "sudo docker image remove nginx " + nodeIP + ":5000/my-webpage" _, err = e2e.RunCmdOnNode(cmd, serverNodeNames[0]) Expect(err).NotTo(HaveOccurred(), "failed: "+cmd) }) It("Should create and validate deployment with private registry on", func() { - res, err := e2e.RunCmdOnNode("sudo kubectl create deployment my-webpage --image=server-0.local/my-webpage", serverNodeNames[0]) + res, err := e2e.RunCmdOnNode("sudo kubectl create deployment my-webpage --image=my-registry.local/my-webpage", serverNodeNames[0]) fmt.Println(res) Expect(err).NotTo(HaveOccurred()) From 479c18c419ed25fd832e51946bd54954949c94a7 Mon Sep 17 00:00:00 2001 From: Ian Cardoso Date: Thu, 1 Jun 2023 12:59:40 -0300 Subject: [PATCH 5/5] fix AfterSuite Signed-off-by: Ian Cardoso --- tests/e2e/privateregistry/privateregistry_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/e2e/privateregistry/privateregistry_test.go b/tests/e2e/privateregistry/privateregistry_test.go index 2b779de00882..3bd79434a026 100644 --- a/tests/e2e/privateregistry/privateregistry_test.go +++ b/tests/e2e/privateregistry/privateregistry_test.go @@ -147,15 +147,15 @@ var _ = AfterEach(func() { }) var _ = AfterSuite(func() { - r1, err := e2e.RunCmdOnNode("sudo docker rm -f registry", serverNodeNames[0]) - fmt.Println(r1) - Expect(err).NotTo(HaveOccurred()) - r2, err := e2e.RunCmdOnNode("sudo kubectl delete deployment my-webpage", serverNodeNames[0]) - fmt.Println(r2) - Expect(err).NotTo(HaveOccurred()) + if failed && !*ci { fmt.Println("FAILED!") } else { + r1, err := e2e.RunCmdOnNode("sudo docker rm -f registry", serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred(), r1) + r2, err := e2e.RunCmdOnNode("sudo kubectl delete deployment my-webpage", serverNodeNames[0]) + Expect(err).NotTo(HaveOccurred(), r2) + Expect(err).NotTo(HaveOccurred()) Expect(e2e.DestroyCluster()).To(Succeed()) Expect(os.Remove(kubeConfigFile)).To(Succeed()) }