kubernetes/cmd
Kubernetes Submit Queue 029c1d8b23
Merge pull request #63159 from ii/kubeadm--config+verbose
Automatic merge from submit-queue (batch tested with PRs 61601, 62881, 63159). 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>.

support simultaneous kubeadm --v and --config

**What this PR does / why we need it**:

Providing -v and --config parameters to increase verbosity while providing a kubeadm.config results in an error rather than providing the requested verbosity.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:

Fixes https://github.com/kubernetes/kubeadm/issues/765

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-04-25 14:03:24 -07:00
..
clicheck Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
cloud-controller-manager Merge pull request #62749 from andrewsykim/ccm-approvers 2018-04-17 15:14:50 -07:00
controller-manager Fix hpa-use-rest-clients help text 2018-04-24 13:29:08 -04:00
gendocs Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
genkubedocs Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
genman Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
genswaggertypedocs Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
genutils Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
genyaml Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
hyperkube Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
importverifier Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
kube-apiserver eliminate indirection from type registration 2018-04-25 09:02:31 -04:00
kube-controller-manager add easy to use dynamic client 2018-04-25 08:55:26 -04:00
kube-proxy Add --ipvs-exclude-cidrs flag to kube-proxy. 2018-04-13 10:09:14 -07:00
kube-scheduler Fix scheduler Pod informers to receive events when pods are scheduled by other schedulers. 2018-04-23 11:07:53 -07:00
kubeadm Merge pull request #63159 from ii/kubeadm--config+verbose 2018-04-25 14:03:24 -07:00
kubectl Merge pull request #60339 from mikedanese/deadpkg 2018-03-28 09:39:15 -07:00
kubelet Merge pull request #62982 from dixudx/warning_kubelet_remote_sandbox 2018-04-25 11:53:11 -07:00
kubemark Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
linkcheck Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
BUILD gke-certificates-controller: rm -rf 2018-02-15 12:01:00 -08:00
OWNERS Updated top level owners file to match new format 2017-01-19 11:29:16 -08:00