From d2fe556309c63dd3d7e97b9b850916389998a48a Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Thu, 15 Feb 2018 17:20:44 -0800 Subject: [PATCH] Updating kubemci e2e test to not add kubeconfig flag for get-status --- test/e2e/framework/ingress_utils.go | 8 ++++---- test/e2e/framework/util.go | 12 ++++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/test/e2e/framework/ingress_utils.go b/test/e2e/framework/ingress_utils.go index bd14628f698..e66d09ddbfd 100644 --- a/test/e2e/framework/ingress_utils.go +++ b/test/e2e/framework/ingress_utils.go @@ -1142,7 +1142,7 @@ func (j *IngressTestJig) RunCreate(ing *extensions.Ingress) (*extensions.Ingress if err := manifest.IngressToManifest(ing, filePath); err != nil { return nil, err } - _, err := RunKubemciCmd("create", ing.Name, fmt.Sprintf("--ingress=%s", filePath)) + _, err := runKubemciWithKubeconfig("create", ing.Name, fmt.Sprintf("--ingress=%s", filePath)) return ing, err } @@ -1157,7 +1157,7 @@ func (j *IngressTestJig) RunUpdate(ing *extensions.Ingress) (*extensions.Ingress if err := manifest.IngressToManifest(ing, filePath); err != nil { return nil, err } - _, err := RunKubemciCmd("create", ing.Name, fmt.Sprintf("--ingress=%s", filePath), "--force") + _, err := runKubemciWithKubeconfig("create", ing.Name, fmt.Sprintf("--ingress=%s", filePath), "--force") return ing, err } @@ -1245,14 +1245,14 @@ func (j *IngressTestJig) RunDelete(ing *extensions.Ingress, class string) error if err := manifest.IngressToManifest(ing, filePath); err != nil { return err } - _, err := RunKubemciCmd("delete", ing.Name, fmt.Sprintf("--ingress=%s", filePath)) + _, err := runKubemciWithKubeconfig("delete", ing.Name, fmt.Sprintf("--ingress=%s", filePath)) return err } // getIngressAddressFromKubemci returns the IP address of the given multicluster ingress using kubemci. // TODO(nikhiljindal): Update this to be able to return hostname as well. func getIngressAddressFromKubemci(name string) ([]string, error) { - out, err := RunKubemciCmd("get-status", name) + out, err := runKubemciCmd("get-status", name) if err != nil { return []string{}, err } diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 4b1a7f224ce..91d1b4145ce 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -2192,9 +2192,17 @@ func RunKubectlOrDieInput(data string, args ...string) string { return NewKubectlCommand(args...).WithStdinData(data).ExecOrDie() } -// RunKubemciCmd is a convenience wrapper over kubectlBuilder to run kubemci. +// runKubemciWithKubeconfig is a convenience wrapper over runKubemciCmd +func runKubemciWithKubeconfig(args ...string) (string, error) { + if TestContext.KubeConfig != "" { + args = append(args, "--"+clientcmd.RecommendedConfigPathFlag+"="+TestContext.KubeConfig) + } + return runKubemciCmd(args...) +} + +// runKubemciCmd is a convenience wrapper over kubectlBuilder to run kubemci. // It assumes that kubemci exists in PATH. -func RunKubemciCmd(args ...string) (string, error) { +func runKubemciCmd(args ...string) (string, error) { // kubemci is assumed to be in PATH. kubemci := "kubemci" b := new(kubectlBuilder)