Skip to content

Commit

Permalink
Doc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ddysher committed Jan 12, 2015
1 parent 6cd3763 commit 2945f87
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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.

## Plugin Development
Expand All @@ -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
provider external to Kubernetes. We plan to make it easy to develop modules
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 changes: 4 additions & 0 deletions docs/devel/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ godep go tool cover -html=target/c.out
## 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``.
```
cd kubernetes
hack/test-integration.sh
```

## End-to-End tests

Expand Down

0 comments on commit 2945f87

Please sign in to comment.