Merge pull request #40175 from apprenda/kubeadm-40155-test-skip

Automatic merge from submit-queue (batch tested with PRs 40175, 41107, 41111, 40893, 40919)

kubeadm: skip integration tests if kubeadm-cmd-skip flag passed

Will skip integration tests for token generation if it can't find a file by the given --kubeadm-path or default value.

**What this PR does / why we need it**: Tests would fail if just running `go test` in the dir because it expects to have more values. This won't change the behavior of `make test-cmd` which gets run here:
https://github.com/kubernetes/kubernetes/blob/master/Makefile#L258

**Which issue this PR fixes**: fixes #40155 

**Special notes for your reviewer**: /cc @pires @pipejakob @liggitt 

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-02-08 01:47:37 -08:00
committed by GitHub
6 changed files with 16 additions and 10 deletions

View File

@@ -327,6 +327,7 @@ kube-master
kube-master-url
kube-reserved
kubeadm-path
kubeadm-cmd-skip
kubecfg-file
kubectl-path
kubelet-address