summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Ma <k82cn@icloud.com>2017-02-07 07:53:50 +0800
committerGitHub <noreply@github.com>2017-02-07 07:53:50 +0800
commita7a93b05e8d0f1be65e8a5cc21ae15e9cc1deab7 (patch)
treefa66330d0e51087283073b727d5f83f5688da0a7
parente2656eb9434292026a3279989a73464a49b19f1b (diff)
parent9dcebd3f830195f14f255dcc0b785eb40cb64905 (diff)
Merge pull request #333 from gyliu513/aggregated-api-servers
Fixed typo in aggregated-api-servers.md.
-rw-r--r--contributors/design-proposals/aggregated-api-servers.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/contributors/design-proposals/aggregated-api-servers.md b/contributors/design-proposals/aggregated-api-servers.md
index 5b3a10c3..37cda329 100644
--- a/contributors/design-proposals/aggregated-api-servers.md
+++ b/contributors/design-proposals/aggregated-api-servers.md
@@ -80,7 +80,7 @@ There are two configurations in which it makes sense to run `kube-aggregator`.
`api.mycompany.com/v2` from another apiserver while you update clients. But
you can't serve `api.mycompany.com/v1/frobbers` and
`api.mcompany.com/v1/grobinators` from different apiservers. This restriction
- allows us to limit the scope of `kube-aggregator` to a managable level.
+ allows us to limit the scope of `kube-aggregator` to a manageable level.
* Follow API conventions: APIs exposed by every API server should adhere to [kubernetes API
conventions](../devel/api-conventions.md).
* Support discovery API: Each API server should support the kubernetes discovery API
@@ -160,7 +160,7 @@ Since the actual server which serves client's request can be opaque to the clien
all API servers need to have homogeneous authentication and authorisation mechanisms.
All API servers will handle authn and authz for their resources themselves.
The current authentication infrastructure allows token authentication delegation to the
-core `kube-apiserver` and trust of an authentication proxy, which can be fullfilled by
+core `kube-apiserver` and trust of an authentication proxy, which can be fulfilled by
`kubernetes-aggregator`.
#### Server Role Bootstrapping