github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59955 from nikhiljindal/kubemcie2e

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 59809, 59955). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Updating kubemci e2e test to not add kubeconfig flag for get-status

Follow up to https://github.com/kubernetes/kubernetes/pull/59234

Updating RunKubemciCmd to not add the --kubeconfig flag and adding a RunKubemciWithKubeconfig method that adds the kubeconfig param before calling RunKubemciCmd
And Updating get-status to use RunKubemciCmd instead of RunKubemciWithKubeconfig.

```release-note
NONE
```

cc @MrHohn @G-Harmon @madhusudancs
This commit is contained in:
Kubernetes Submit Queue 2018-02-15 22:42:33 -08:00 committed by GitHub
commit 430c1a68c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/ingress_utils.go
View File

@ -1142,7 +1142,7 @@ func (j *IngressTestJig) RunCreate(ing *extensions.Ingress) (*extensions.Ingress
if err := manifest.IngressToManifest(ing, filePath); err != nil { if err := manifest.IngressToManifest(ing, filePath); err != nil {
return nil, err 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 return ing, err
} }
@ -1157,7 +1157,7 @@ func (j *IngressTestJig) RunUpdate(ing *extensions.Ingress) (*extensions.Ingress
if err := manifest.IngressToManifest(ing, filePath); err != nil { if err := manifest.IngressToManifest(ing, filePath); err != nil {
return nil, err 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 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 { if err := manifest.IngressToManifest(ing, filePath); err != nil {
return err return err
} }
_, err := RunKubemciCmd("delete", ing.Name, fmt.Sprintf("--ingress=%s", filePath)) _, err := runKubemciWithKubeconfig("delete", ing.Name, fmt.Sprintf("--ingress=%s", filePath))
return err return err
} }
// getIngressAddressFromKubemci returns the IP address of the given multicluster ingress using kubemci. // getIngressAddressFromKubemci returns the IP address of the given multicluster ingress using kubemci.
// TODO(nikhiljindal): Update this to be able to return hostname as well. // TODO(nikhiljindal): Update this to be able to return hostname as well.
func getIngressAddressFromKubemci(name string) ([]string, error) { func getIngressAddressFromKubemci(name string) ([]string, error) {
out, err := RunKubemciCmd("get-status", name) out, err := runKubemciCmd("get-status", name)
if err != nil { if err != nil {
return []string{}, err return []string{}, err
} }

12
test/e2e/framework/util.go
View File

@ -2192,9 +2192,17 @@ func RunKubectlOrDieInput(data string, args ...string) string {
return NewKubectlCommand(args...).WithStdinData(data).ExecOrDie() 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. // 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 is assumed to be in PATH.
kubemci := "kubemci" kubemci := "kubemci"
b := new(kubectlBuilder) b := new(kubectlBuilder)