github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59992 from nikhiljindal/kubemcie2e

Browse Source 
Automatic merge from submit-queue. 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>.

Do not add kubeconfig flag while running kubemci unless explicitly requested

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

Now that we have runKubemciWithKubeconfig, runKubemciCmd should not be adding kubeconfig flag.

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-17 20:53:53 -08:00 committed by GitHub
commit 6775a3252d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2206,9 +2206,6 @@ 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)
if TestContext.KubeConfig != "" {
args = append(args, "--"+clientcmd.RecommendedConfigPathFlag+"="+TestContext.KubeConfig)
}
args = append(args, "--gcp-project="+TestContext.CloudConfig.ProjectID) args = append(args, "--gcp-project="+TestContext.CloudConfig.ProjectID)
b.cmd = exec.Command(kubemci, args...) b.cmd = exec.Command(kubemci, args...)