mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
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
This commit is contained in:
commit
be5e98fafd
@ -75,6 +75,8 @@ func main() {
|
|||||||
log.SetFlags(log.LstdFlags | log.Lshortfile)
|
log.SetFlags(log.LstdFlags | log.Lshortfile)
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
|
os.Setenv("KUBECTL", *root+`/cluster/kubectl.sh`+kubectlArgs())
|
||||||
|
|
||||||
if *isup {
|
if *isup {
|
||||||
status := 1
|
status := 1
|
||||||
if IsUp() {
|
if IsUp() {
|
||||||
@ -96,8 +98,6 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
os.Setenv("KUBECTL", *root+`/cluster/kubectl.sh`+kubectlArgs())
|
|
||||||
|
|
||||||
if *pushup {
|
if *pushup {
|
||||||
if IsUp() {
|
if IsUp() {
|
||||||
log.Printf("e2e cluster is up, pushing.")
|
log.Printf("e2e cluster is up, pushing.")
|
||||||
|
Loading…
Reference in New Issue
Block a user