github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 10:17:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45781 from robertojrojas/issue_45736

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38990, 45781, 46225, 44899, 43663)

kubectl: fixes issues #45736 and #45737

**What this PR does / why we need it**:
This PR improves the help displayed by the `kubectl proxy` command.

**Which issue this PR fixes**: 
fixes #45736, fixes #45737 

**Special notes for your reviewer**:
NONE

**Release note**:
NONE

```release-note
```
This commit is contained in:
Kubernetes Submit Queue
2017-05-22 19:07:04 -07:00
committed by GitHub
parent 503a8421fb e24384643e
commit 26a0db1722
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubectl/cmd/proxy.go
View File

@@ -35,23 +35,28 @@ import (
var ( var (
defaultPort = 8001 defaultPort = 8001
proxyLong = templates.LongDesc(i18n.T(` proxyLong = templates.LongDesc(i18n.T(`
To proxy all of the kubernetes api and nothing else, use: Creates a proxy server or application-level gateway between localhost and
the Kubernetes API Server. It also allows serving static content over specified
HTTP path. All incoming data enters through one port and gets forwarded to
the remote kubernetes API Server port, except for the path matching the static content path.`))
proxyExample = templates.Examples(i18n.T(`
# To proxy all of the kubernetes api and nothing else, use:
$ kubectl proxy --api-prefix=/ $ kubectl proxy --api-prefix=/
To proxy only part of the kubernetes api and also some static files: # To proxy only part of the kubernetes api and also some static files:
$ kubectl proxy --www=/my/files --www-prefix=/static/ --api-prefix=/api/ $ kubectl proxy --www=/my/files --www-prefix=/static/ --api-prefix=/api/
The above lets you 'curl localhost:8001/api/v1/pods'. # The above lets you 'curl localhost:8001/api/v1/pods'.
To proxy the entire kubernetes api at a different root, use: # To proxy the entire kubernetes api at a different root, use:
$ kubectl proxy --api-prefix=/custom/ $ kubectl proxy --api-prefix=/custom/
The above lets you 'curl localhost:8001/custom/api/v1/pods'`)) # The above lets you 'curl localhost:8001/custom/api/v1/pods'
proxyExample = templates.Examples(i18n.T(`
# Run a proxy to kubernetes apiserver on port 8011, serving static content from ./local/www/ # Run a proxy to kubernetes apiserver on port 8011, serving static content from ./local/www/
kubectl proxy --port=8011 --www=./local/www/ kubectl proxy --port=8011 --www=./local/www/