diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-10-21 10:47:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 10:47:01 -0700 |
| commit | f49e582ed3c2eb0d5893c8d0f20ec03aa66654a4 (patch) | |
| tree | 25057eda0d238a3bd1d1d8a41c2a4ba124237118 | |
| parent | ac606a3553f88067f435fe0b1657e73748d1af25 (diff) | |
| parent | 5939e2abb179bfd4eede8558415fbe9cb6e93c06 (diff) | |
Merge pull request #1248 from zhxcai/kube
Automatic merge from submit-queue.
Update technical words for kubernetes
4 files changed, 5 insertions, 5 deletions
diff --git a/contributors/design-proposals/architecture/0000-kep-template.md b/contributors/design-proposals/architecture/0000-kep-template.md index 76d57fbd..8ba4da4a 100644 --- a/contributors/design-proposals/architecture/0000-kep-template.md +++ b/contributors/design-proposals/architecture/0000-kep-template.md @@ -165,7 +165,7 @@ Major milestones in the life cycle of a KEP should be tracked in design - the date implementation started - the first Kubernetes release where an initial version of the KEP was available -- the version of Kubneretes where the KEP graduated to general availability +- the version of Kubernetes where the KEP graduated to general availability - when the KEP was retired or superseded ## Drawbacks [optional] diff --git a/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md b/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md index ecea9a00..ff50b829 100644 --- a/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md +++ b/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md @@ -289,7 +289,7 @@ with the following example structure │ └── retired ├── sig-node │ ├── deferred -│ ├── kublet +│ ├── kubelet │ ├── orphaned │ └── retired ├── sig-release diff --git a/contributors/design-proposals/scalability/kubemark.md b/contributors/design-proposals/scalability/kubemark.md index 95888c94..e5f4b26b 100644 --- a/contributors/design-proposals/scalability/kubemark.md +++ b/contributors/design-proposals/scalability/kubemark.md @@ -45,8 +45,8 @@ components on non-default ports, and in the same time will allow to run multiple generate credentials for cluster communication and pass them to HollowKubelet/HollowProxy to use. Master will treat all HollowNodes as normal ones. - -*Kubmark architecture diagram for option 1* + +*Kubemark architecture diagram for option 1* ### Option 2 diff --git a/contributors/design-proposals/scalability/scalability-testing.md b/contributors/design-proposals/scalability/scalability-testing.md index d0fcd1be..ae3e3534 100644 --- a/contributors/design-proposals/scalability/scalability-testing.md +++ b/contributors/design-proposals/scalability/scalability-testing.md @@ -19,7 +19,7 @@ Once we have a better understanding of their consequences, we may want to decide to drop one of them, but we are not yet in that position. -## Proposal 1 - Kubmark +## Proposal 1 - Kubemark In this proposal we are focusing on scalability testing of master components. We do NOT focus on node-scalability - this issue should be handled separately. |