summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-ci-robot <k8s-ci-robot@users.noreply.github.com>2018-02-08 19:14:51 -0800
committerGitHub <noreply@github.com>2018-02-08 19:14:51 -0800
commit88d7f282861bd267245b21d54b503d3457dacd92 (patch)
tree4aeff23d59cac04e53d449cd7bafe41dd3369f38
parentd45e5b375dbe8a3eb5b571e34750718876f6cbc1 (diff)
parent87cc56c36786c5b21b70cfa0884c6211b292b463 (diff)
Merge pull request #1763 from lijianfeng1993/fix_some_duplication_problems
fix some duplication problems in api-machinery
-rw-r--r--contributors/design-proposals/api-machinery/apiserver-count-fix.md2
-rw-r--r--contributors/design-proposals/api-machinery/bulk_watch.md2
-rw-r--r--contributors/design-proposals/api-machinery/server-get.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/contributors/design-proposals/api-machinery/apiserver-count-fix.md b/contributors/design-proposals/api-machinery/apiserver-count-fix.md
index 6ea3d703..a2f312a6 100644
--- a/contributors/design-proposals/api-machinery/apiserver-count-fix.md
+++ b/contributors/design-proposals/api-machinery/apiserver-count-fix.md
@@ -66,7 +66,7 @@ updates could be overly chatty.
By porting OpenShift's
[LeaseEndpointReconciler](https://github.com/openshift/origin/blob/master/pkg/cmd/server/election/lease_endpoint_reconciler.go)
-to Kubernetes we can use use the Storage API directly to store Endpoints
+to Kubernetes we can use the Storage API directly to store Endpoints
dynamically within the system.
### Alternate Proposals
diff --git a/contributors/design-proposals/api-machinery/bulk_watch.md b/contributors/design-proposals/api-machinery/bulk_watch.md
index 0a92ac32..1b50f685 100644
--- a/contributors/design-proposals/api-machinery/bulk_watch.md
+++ b/contributors/design-proposals/api-machinery/bulk_watch.md
@@ -470,7 +470,7 @@ be send multiple times, once over each channel, here it would be send once)
- we would have to introduce a dedicate "BulkWatchEvent" type to incorporate
resource type. This would make those two incompatible even at the output format.
- With all of those in mind, even though the implementation would be much much
+ With all of those in mind, even though the implementation would be much
simpler (and could potentially be a first step and would probably solve the
original "kubelet watching secrets" problem good enough), we decided not to
proceed with it at all.
diff --git a/contributors/design-proposals/api-machinery/server-get.md b/contributors/design-proposals/api-machinery/server-get.md
index ef68e125..576a1916 100644
--- a/contributors/design-proposals/api-machinery/server-get.md
+++ b/contributors/design-proposals/api-machinery/server-get.md
@@ -157,7 +157,7 @@ show-kind | Implement client-side by using the discovery info associated with th
template | Implement client-side, bypass receiving table output and get raw objects
watch | Request Table output via the watch endpoint
export | Implement client-side, bypass receiving table output and get exported object
-wide | Server should indicate which columns are "additional" via a field on on the header column - client then shows those columns if it wants to
+wide | Server should indicate which columns are "additional" via a field on the header column - client then shows those columns if it wants to
color (proposed) | Rows which should be highlighted should have a semantic field on the row - e.g. `alert: [{type: Warning, message: "This pod has been deleted"}]`. Cells could be selected by adding an additional field `alert: [{type: Warning, ..., cells: [0, 1]}]`.