diff --git a/go.mod b/go.mod index cdd45b1752b1..0a32ef294c06 100644 --- a/go.mod +++ b/go.mod @@ -107,7 +107,7 @@ require ( github.com/joho/godotenv v1.5.1 github.com/json-iterator/go v1.1.12 github.com/k3s-io/helm-controller v0.16.5 - github.com/k3s-io/kine v0.13.4 + github.com/k3s-io/kine v0.13.5 github.com/klauspost/compress v1.17.11 github.com/libp2p/go-libp2p v0.33.2 github.com/minio/minio-go/v7 v7.0.70 diff --git a/go.sum b/go.sum index 912db6c337e2..120b34b95955 100644 --- a/go.sum +++ b/go.sum @@ -962,8 +962,8 @@ github.com/k3s-io/etcd/server/v3 v3.5.16-k3s1 h1:9c0DChFw6WRz6r+eCuVLBltZcRwT6h1 github.com/k3s-io/etcd/server/v3 v3.5.16-k3s1/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= github.com/k3s-io/helm-controller v0.16.5 h1:SsUHfksQXNwePkswv4a970EGD2h0Exsf6t3IdXhpXRo= github.com/k3s-io/helm-controller v0.16.5/go.mod h1:AcSxEhOIUgeVvBTnJOAwcezBZXtYew/RhKwO5xp3RlM= -github.com/k3s-io/kine v0.13.4 h1:x+cCyEd640pu5loX8ZD7FdtsZPXJXP0+mvuGmUZy8SI= -github.com/k3s-io/kine v0.13.4/go.mod h1:OIG+kPc9cU+NDHnVm+aR0PyZYExdZWU+vlJynhH4haU= +github.com/k3s-io/kine v0.13.5 h1:bVTcxCHJVUqeyz0mJenO+WFHkxtgD2aRwLt1JcJ0pq8= +github.com/k3s-io/kine v0.13.5/go.mod h1:OIG+kPc9cU+NDHnVm+aR0PyZYExdZWU+vlJynhH4haU= github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsaol57dxw= github.com/k3s-io/klog/v2 v2.120.1-k3s1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= github.com/k3s-io/kube-router/v2 v2.2.1 h1:LrU6l4khFt67+QCIvgok9B/C9JY/U2/TaF9TCVUw0vw= diff --git a/tests/e2e/testutils.go b/tests/e2e/testutils.go index 357e41992978..950a3c8af896 100644 --- a/tests/e2e/testutils.go +++ b/tests/e2e/testutils.go @@ -314,22 +314,29 @@ func FetchNodeExternalIP(nodename string) (string, error) { } func GenKubeConfigFile(serverName string) (string, error) { - cmd := fmt.Sprintf("vagrant ssh %s -c \"sudo cat /etc/rancher/k3s/k3s.yaml\"", serverName) - kubeConfig, err := RunCommand(cmd) + kubeConfigFile := fmt.Sprintf("kubeconfig-%s", serverName) + cmd := fmt.Sprintf("vagrant scp %s:/etc/rancher/k3s/k3s.yaml ./%s", serverName, kubeConfigFile) + _, err := RunCommand(cmd) + if err != nil { + return "", err + } + + kubeConfig, err := os.ReadFile(kubeConfigFile) if err != nil { return "", err } + re := regexp.MustCompile(`(?m)==> vagrant:.*\n`) - kubeConfig = re.ReplaceAllString(kubeConfig, "") + modifiedKubeConfig := re.ReplaceAllString(string(kubeConfig), "") nodeIP, err := FetchNodeExternalIP(serverName) if err != nil { return "", err } - kubeConfig = strings.Replace(kubeConfig, "127.0.0.1", nodeIP, 1) - kubeConfigFile := fmt.Sprintf("kubeconfig-%s", serverName) - if err := os.WriteFile(kubeConfigFile, []byte(kubeConfig), 0644); err != nil { + modifiedKubeConfig = strings.Replace(modifiedKubeConfig, "127.0.0.1", nodeIP, 1) + if err := os.WriteFile(kubeConfigFile, []byte(modifiedKubeConfig), 0644); err != nil { return "", err } + if err := os.Setenv("E2E_KUBECONFIG", kubeConfigFile); err != nil { return "", err } @@ -495,6 +502,9 @@ func RunCmdOnNode(cmd string, nodename string) (string, error) { } runcmd := "vagrant ssh " + nodename + " -c \"sudo " + injectEnv + cmd + "\"" out, err := RunCommand(runcmd) + // On GHA CI we see warnings about "[fog][WARNING] Unrecognized arguments: libvirt_ip_command" + // these are added to the command output and need to be removed + out = strings.ReplaceAll(out, "[fog][WARNING] Unrecognized arguments: libvirt_ip_command\n", "") if err != nil { return out, fmt.Errorf("failed to run command: %s on node %s: %s, %v", cmd, nodename, out, err) }