Skip to content

Commit

Permalink
Merge pull request #18164 from deads2k/cobra-update
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 18108, 18150, 18164, 18147, 18143).

picks to make upstream commands use cobra

Brings various fixes in to make the commands use cobra.  This is required to fix hyperkube and needed for us to reasonably delegate blindly to other commands.

/assign mfojtik
/assign soltysh
  • Loading branch information
openshift-merge-robot committed Jan 19, 2018
2 parents 9e66c98 + cf77b57 commit 69bc601
Show file tree
Hide file tree
Showing 16 changed files with 675 additions and 158 deletions.
250 changes: 250 additions & 0 deletions contrib/completions/bash/oc

Large diffs are not rendered by default.

250 changes: 250 additions & 0 deletions contrib/completions/zsh/oc

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 0 additions & 52 deletions vendor/k8s.io/kubernetes/cmd/hyperkube/kube-aggregator.go

This file was deleted.

1 change: 0 additions & 1 deletion vendor/k8s.io/kubernetes/cmd/hyperkube/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions vendor/k8s.io/kubernetes/cmd/kube-apiserver/apiserver.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/k8s.io/kubernetes/cmd/kube-proxy/proxy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 22 additions & 3 deletions vendor/k8s.io/kubernetes/cmd/kubectl/kubectl.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 69bc601

Please sign in to comment.