DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor controller metrics interface

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-07-07 13:46:18 -04:00 • committed by Manuel Alejandro de Brito Fontes
parent bdd2c5e3be
commit 1542a12764
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
30 changed files with 1896 additions and 630 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/e2e/framework/framework.go
View file

@ -15,7 +15,7 @@ package framework
import (
"fmt"
"os/exec"
"os"
"strings"
"time"
@ -112,13 +112,11 @@ func (f *Framework) BeforeEach() {
})
Expect(err).NotTo(HaveOccurred())
By("Building NGINX HTTP URL")
HTTPURL, err := f.GetNginxURL(HTTP)
Expect(err).NotTo(HaveOccurred())
f.IngressController.HTTPURL = HTTPURL
By("Building NGINX HTTPS URL")
HTTPSURL, err := f.GetNginxURL(HTTPS)
Expect(err).NotTo(HaveOccurred())
@ -145,11 +143,7 @@ func IngressNginxDescribe(text string, body func()) bool {
// GetNginxIP returns the IP address of the minikube cluster
// where the NGINX ingress controller is running
func (f *Framework) GetNginxIP() (string, error) {
out, err := exec.Command("minikube", "ip").Output()
if err != nil {
return "", err
}
return strings.TrimSpace(string(out)), nil
return os.Getenv("NODE_IP"), nil
}
// GetNginxPort returns the number of TCP port where NGINX is running