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

Merge pull request #3398 from ddysher/fixes

Browse Source 
Doc fixes
This commit is contained in:
Joe Beda 2015-01-12 10:59:54 -08:00
commit d890707237
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/authentication.md
View File

@ -7,7 +7,7 @@ to apiserver. Currently, tokens last indefinitely, and the token list cannot
be changed without restarting apiserver. We plan in the future for tokens to be changed without restarting apiserver. We plan in the future for tokens to
be short-lived, and to be generated as needed rather than stored in a file. be short-lived, and to be generated as needed rather than stored in a file.
The token file format is implemented in `pkg/auth/authenticator/tokenfile/...` The token file format is implemented in `plugin/pkg/auth/authenticator/token/tokenfile/...`
and is a csv file with 3 columns: token, user name, user uid. and is a csv file with 3 columns: token, user name, user uid.
## Plugin Development ## Plugin Development
@ -16,4 +16,4 @@ We plan for the Kubernetes API server to issue tokens
after the user has been (re)authenticated by a *bedrock* authentication after the user has been (re)authenticated by a *bedrock* authentication
provider external to Kubernetes. We plan to make it easy to develop modules provider external to Kubernetes. We plan to make it easy to develop modules
that interface between kubernetes and a bedrock authentication provider (e.g. that interface between kubernetes and a bedrock authentication provider (e.g.
github.com, google.com, enterprise directory, kerberos, etc.) github.com, google.com, enterprise directory, kerberos, etc.)

4
docs/devel/development.md
View File

@ -137,6 +137,10 @@ godep go tool cover -html=target/c.out
## Integration tests ## Integration tests
You need an [etcd](https://github.com/coreos/etcd/releases/tag/v0.4.6) in your path, please make sure it is installed and in your ``$PATH``. You need an [etcd](https://github.com/coreos/etcd/releases/tag/v0.4.6) in your path, please make sure it is installed and in your ``$PATH``.
```
cd kubernetes
hack/test-integration.sh
```
## End-to-End tests ## End-to-End tests