diff --git a/docs/authentication.md b/docs/authentication.md index dc4273151fd..70e2c98d398 100644 --- a/docs/authentication.md +++ b/docs/authentication.md @@ -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 @@ -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.) diff --git a/docs/devel/development.md b/docs/devel/development.md index 2b7476e82c7..bd18b82852e 100644 --- a/docs/devel/development.md +++ b/docs/devel/development.md @@ -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