Skip to content

K
k3s
Commit be5e98fa authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28959 from asalkeld/e2e-isup

Automatic merge from submit-queue e2e.go --isup should also check the version Just move the setenv up to include --isup fixes #18667
parents f7409f3b 5c3eea15
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/e2e.go
View file @ be5e98fa
......@@ -75,6 +75,8 @@ func main() {
log.SetFlags(log.LstdFlags | log.Lshortfile)
flag.Parse()
os.Setenv("KUBECTL", *root+`/cluster/kubectl.sh`+kubectlArgs())
if *isup {
status := 1
if IsUp() {
......@@ -96,8 +98,6 @@ func main() {
}
}
os.Setenv("KUBECTL", *root+`/cluster/kubectl.sh`+kubectlArgs())
if *pushup {
if IsUp() {
log.Printf("e2e cluster is up, pushing.")
......
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