diff --git a/cn/docs/concepts/cluster-administration/device-plugins.md b/cn/docs/concepts/cluster-administration/device-plugins.md index 656df45899..9ba08c8915 100644 --- a/cn/docs/concepts/cluster-administration/device-plugins.md +++ b/cn/docs/concepts/cluster-administration/device-plugins.md @@ -58,7 +58,7 @@ service Registration { ```gRPC service DevicePlugin { // ListAndWatch returns a stream of List of Devices - // Whenever a Device state change or a Device disapears, ListAndWatch + // Whenever a Device state change or a Device disappears, ListAndWatch // returns the new list rpc ListAndWatch(Empty) returns (stream ListAndWatchResponse) {} diff --git a/cn/docs/concepts/overview/what-is-kubernetes.md b/cn/docs/concepts/overview/what-is-kubernetes.md index 46bce4b2f4..2b0de77af6 100644 --- a/cn/docs/concepts/overview/what-is-kubernetes.md +++ b/cn/docs/concepts/overview/what-is-kubernetes.md @@ -91,7 +91,7 @@ Kubernetes 提供了很多的功能，总会有新的场景受益于新特性。 [Label](/docs/user-guide/labels/) 允许用户按照自己的方式组织管理对应的资源。 [注解](/docs/user-guide/annotations/) 使用户能够以自定义的描述信息来修饰资源，以适用于自己的工作流，并为管理工具提供检查点状态的简单方法。 -此外，[Kubernetes 控制面 (Controll Plane)](/docs/admin/cluster-components) 是构建在相同的 [APIs](/docs/api/) 上面，开发人员和用户都可以用。用户可以编写自己的控制器， [调度器](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel/scheduler.md)等等，如果这么做，根据新加的[自定义 API](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/extending-api.md) ，可以扩展当前的通用 [CLI 命令行工具](/docs/user-guide/kubectl-overview/)。 +此外，[Kubernetes 控制面 (Control Plane)](/docs/admin/cluster-components) 是构建在相同的 [APIs](/docs/api/) 上面，开发人员和用户都可以用。用户可以编写自己的控制器， [调度器](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel/scheduler.md)等等，如果这么做，根据新加的[自定义 API](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/extending-api.md) ，可以扩展当前的通用 [CLI 命令行工具](/docs/user-guide/kubectl-overview/)。 这种 [设计](https://git.k8s.io/community/contributors/design-proposals/architecture/principles.md) 使得许多其他系统可以构建在 Kubernetes 之上。 diff --git a/docs/imported/release/notes.md b/docs/imported/release/notes.md index d6afe1f175..99c6707d13 100755 --- a/docs/imported/release/notes.md +++ b/docs/imported/release/notes.md @@ -1418,7 +1418,7 @@ filename | sha256 hash * RBAC PolicyRules now allow resource=`*/` to cover `any-resource/`. For example, `*/scale` covers `replicationcontroller/scale`. ([#53722](https://github.com/kubernetes/kubernetes/pull/53722), [@deads2k](https://github.com/deads2k)) * Upgrade to go1.9 ([#51375](https://github.com/kubernetes/kubernetes/pull/51375), [@cblecker](https://github.com/cblecker)) * Webhook always retries connection reset error. ([#53947](https://github.com/kubernetes/kubernetes/pull/53947), [@crassirostris](https://github.com/crassirostris)) -* fix PV Recycle failed on non-amd64 platfrom ([#53958](https://github.com/kubernetes/kubernetes/pull/53958), [@dixudx](https://github.com/dixudx)) +* fix PV Recycle failed on non-amd64 platform ([#53958](https://github.com/kubernetes/kubernetes/pull/53958), [@dixudx](https://github.com/dixudx)) * Verbose option is added to each status function in CRI. Container runtime could return extra information in status response for debugging. ([#53965](https://github.com/kubernetes/kubernetes/pull/53965), [@Random-Liu](https://github.com/Random-Liu)) * Fixed log fallback termination messages when using docker with journald log driver ([#52503](https://github.com/kubernetes/kubernetes/pull/52503), [@joelsmith](https://github.com/joelsmith)) * falls back to parse Docker runtime version as generic if not semver ([#54040](https://github.com/kubernetes/kubernetes/pull/54040), [@dixudx](https://github.com/dixudx)) @@ -1698,7 +1698,7 @@ filename | sha256 hash * Adds a new alpha EventRateLimit admission control that is used to limit the number of event queries that are accepted by the API Server. ([#50925](https://github.com/kubernetes/kubernetes/pull/50925), [@staebler](https://github.com/staebler)) * The OpenID Connect authenticator can now use a custom prefix, or omit the default prefix, for username and groups claims through the --oidc-username-prefix and --oidc-groups-prefix flags. For example, the authenticator can map a user with the username "jane" to "google:jane" by supplying the "google:" username prefix. ([#50875](https://github.com/kubernetes/kubernetes/pull/50875), [@ericchiang](https://github.com/ericchiang)) * Implemented `kubeadm upgrade plan` for checking whether you can upgrade your cluster to a newer version ([#48899](https://github.com/kubernetes/kubernetes/pull/48899), [@luxas](https://github.com/luxas)) - * Implemented `kubeadm upgrade apply` for upgrading your cluster from one version to an other + * Implemented `kubeadm upgrade apply` for upgrading your cluster from one version to another * Switch to audit.k8s.io/v1beta1 in audit. ([#51719](https://github.com/kubernetes/kubernetes/pull/51719), [@soltysh](https://github.com/soltysh)) * update QEMU version to v2.9.1 ([#50597](https://github.com/kubernetes/kubernetes/pull/50597), [@dixudx](https://github.com/dixudx)) * controllers backoff better in face of quota denial ([#49142](https://github.com/kubernetes/kubernetes/pull/49142), [@joelsmith](https://github.com/joelsmith)) diff --git a/docs/reference/generated/federation/extensions/v1beta1/definitions.html b/docs/reference/generated/federation/extensions/v1beta1/definitions.html index 8bf9ea6faa..cdeef7b790 100755 --- a/docs/reference/generated/federation/extensions/v1beta1/definitions.html +++ b/docs/reference/generated/federation/extensions/v1beta1/definitions.html @@ -2591,7 +2591,7 @@ When an object is created, the system will populate this list with the current s

prefix

-

An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

+

An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.

false

string

diff --git a/docs/reference/generated/kube-apiserver.md b/docs/reference/generated/kube-apiserver.md index ce48bc0422..4f609d9a6d 100644 --- a/docs/reference/generated/kube-apiserver.md +++ b/docs/reference/generated/kube-apiserver.md @@ -140,7 +140,7 @@ VolumeScheduling=true|false (ALPHA - default=false) --oidc-username-claim string The OpenID claim to use as the user name. Note that claims other than the default ('sub') is not guaranteed to be unique and immutable. This flag is experimental, please see the authentication documentation for further details. (default "sub") --oidc-username-prefix string If provided, all usernames will be prefixed with this value. If not provided, username claims other than 'email' are prefixed by the issuer URL to avoid clashes. To skip any prefixing, provide the value '-'. --profiling Enable profiling via web interface host:port/debug/pprof/ (default true) - --proxy-client-cert-file string Client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. It is expected that this cert includes a signature from the CA in the --requestheader-client-ca-file flag. That CA is published in the 'extension-apiserver-authentication' configmap in the kube-system namespace. Components recieving calls from kube-aggregator should use that CA to perform their half of the mutual TLS verification. + --proxy-client-cert-file string Client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. It is expected that this cert includes a signature from the CA in the --requestheader-client-ca-file flag. That CA is published in the 'extension-apiserver-authentication' configmap in the kube-system namespace. Components receiving calls from kube-aggregator should use that CA to perform their half of the mutual TLS verification. --proxy-client-key-file string Private key for the client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. --repair-malformed-updates If true, server will do its best to fix the update request to pass the validation, e.g., setting empty UID in update request to its existing value. This flag can be turned off after we fix all the clients that send malformed updates. (default true) --request-timeout duration An optional field indicating the duration a handler must keep a request open before timing it out. This is the default request timeout for requests but may be overridden by flags such as --min-request-timeout for specific types of requests. (default 1m0s) diff --git a/docs/reference/generated/kubectl/kubectl-commands.html b/docs/reference/generated/kubectl/kubectl-commands.html index 9ceec9a44c..a77cfaedbb 100644 --- a/docs/reference/generated/kubectl/kubectl-commands.html +++ b/docs/reference/generated/kubectl/kubectl-commands.html @@ -7653,7 +7653,7 @@ applications.

kubectl alpha diff -f pod.json -f service.yaml LAST LOCAL

Diff configurations specified by filename or stdin between their local, last-applied, live and/or "merged" versions.

-

LOCAL and LIVE versions are diffed by default. Other availble keywords are MERGED and LAST.

+

LOCAL and LIVE versions are diffed by default. Other available keywords are MERGED and LAST.

Output is always YAML.

KUBERNETES EXTERNAL DIFF environment variable can be used to select your own diff command. By default, the "diff" command available in your path will be run with "-u" (unicode) and "-N" (treat new files as empty) options.

Usage

@@ -7728,7 +7728,7 @@ source $HOME/.bash_profile 
kubectl completion zsh > "${fpath[1]}/_kubectl"
-

Output shell completion code for the specified shell (bash or zsh). The shell code must be evalutated to provide interactive completion of kubectl commands. This can be done by sourcing it from the .bash _profile.

+

Output shell completion code for the specified shell (bash or zsh). The shell code must be evaluated to provide interactive completion of kubectl commands. This can be done by sourcing it from the .bash _profile.

Detailed instructions on how to do this are available here: https://kubernetes.io/docs/tasks/tools/install-kubectl/#enabling-shell-autocompletion

Note for zsh users: [1] zsh completions are only supported in versions of zsh >= 5.2

Usage

diff --git a/docs/reference/generated/kubectl/scroll.js b/docs/reference/generated/kubectl/scroll.js index 67fee8729e..ae0afcc77f 100644 --- a/docs/reference/generated/kubectl/scroll.js +++ b/docs/reference/generated/kubectl/scroll.js @@ -187,7 +187,7 @@ $(document).ready(function() { var scrollPosition = $(window).scrollTop(); scrollActions(scrollPosition); checkActiveElement(flatToc, scrollPosition); - // TODO: prevent scroll on sidebar from propogating to window + // TODO: prevent scroll on sidebar from propagating to window $(window).on('scroll', function(event) { var scrollPosition = $(window).scrollTop(); var activeSectionTokens = scrollActions(scrollPosition); diff --git a/docs/reference/generated/kubernetes-api/v1.9/index.html b/docs/reference/generated/kubernetes-api/v1.9/index.html index a73e08cd66..86e75f54e9 100644 --- a/docs/reference/generated/kubernetes-api/v1.9/index.html +++ b/docs/reference/generated/kubernetes-api/v1.9/index.html @@ -61973,7 +61973,7 @@ Appears In: prefix
string -An optional identifer to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. +An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. secretRef
SecretEnvSource @@ -62099,7 +62099,7 @@ Appears In: -

EventSeries contain information on series of events, i.e. thing that was/is happening continously for some time.

+

EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.