Skip to content

Commit 2264312

Browse files
committed
Merge remote-tracking branch 'upstream/main' into dev-1.24
2 parents 0b4f78f + 0161480 commit 2264312

File tree

42 files changed

+1159
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1159
-649
lines changed

OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ aliases:
162162
# hanjiayao
163163
- howieyuen
164164
# lichuqiang
165+
- mengjiao-liu
165166
- SataQiu
166167
- tanjunchen
167168
- tengqm

README-zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Hugo is shipped in two set of binaries for technical reasons. The current websit
123123

124124
由于技术原因,Hugo 会发布两套二进制文件。
125125
当前网站仅基于 **Hugo Extended** 版本运行。
126-
[发布页面](https://github.com/gohugoio/hugo/releases) 中查找名称为 `extended` 的归档。可以运行 `huge version` 查看是否有单词 `extended` 来确认。
126+
[发布页面](https://github.com/gohugoio/hugo/releases) 中查找名称为 `extended` 的归档。可以运行 `hugo version` 查看是否有单词 `extended` 来确认。
127127

128128
<!--
129129
### Troubleshooting macOS for too many open files

content/en/docs/concepts/configuration/configmap.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ If the data you want to store are confidential, use a
1515
or use additional (third party) tools to keep your data private.
1616
{{< /caution >}}
1717

18-
1918
<!-- body -->
2019
## Motivation
2120

@@ -282,5 +281,3 @@ to the deleted ConfigMap, it is recommended to recreate these pods.
282281
* Read [Configure a Pod to Use a ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/).
283282
* Read [The Twelve-Factor App](https://12factor.net/) to understand the motivation for
284283
separating code from configuration.
285-
286-

content/en/docs/concepts/overview/what-is-kubernetes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ reviewers:
44
- mikedanese
55
title: What is Kubernetes?
66
description: >
7-
Kubernetes is a portable, extensible, open-source platform for managing containerized workloads and services, that facilitates both declarative configuration and automation. It has a large, rapidly growing ecosystem. Kubernetes services, support, and tools are widely available.
7+
Kubernetes is a portable, extensible, open source platform for managing containerized workloads and services, that facilitates both declarative configuration and automation. It has a large, rapidly growing ecosystem. Kubernetes services, support, and tools are widely available.
88
content_type: concept
99
weight: 10
1010
card:
@@ -19,7 +19,7 @@ This page is an overview of Kubernetes.
1919

2020

2121
<!-- body -->
22-
Kubernetes is a portable, extensible, open-source platform for managing containerized workloads and services, that facilitates both declarative configuration and automation. It has a large, rapidly growing ecosystem. Kubernetes services, support, and tools are widely available.
22+
Kubernetes is a portable, extensible, open source platform for managing containerized workloads and services, that facilitates both declarative configuration and automation. It has a large, rapidly growing ecosystem. Kubernetes services, support, and tools are widely available.
2323

2424
The name Kubernetes originates from Greek, meaning helmsman or pilot. K8s as an abbreviation results from counting the eight letters between the "K" and the "s". Google open-sourced the Kubernetes project in 2014. Kubernetes combines [over 15 years of Google's experience](/blog/2015/04/borg-predecessor-to-kubernetes/) running production workloads at scale with best-of-breed ideas and practices from the community.
2525

content/en/docs/concepts/services-networking/service.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ Each port definition can have the same `protocol`, or a different one.
158158

159159
### Services without selectors
160160

161-
Services most commonly abstract access to Kubernetes Pods, but they can also
162-
abstract other kinds of backends.
163-
For example:
161+
Services most commonly abstract access to Kubernetes Pods thanks to the selector,
162+
but when used with a corresponding Endpoints object and without a selector, the Service can abstract other kinds of backends,
163+
including ones that run outside the cluster. For example:
164164

165165
* You want to have an external database cluster in production, but in your
166166
test environment you use your own databases.

content/en/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ different Kubernetes components.
450450
| `ServerSideApply` | `false` | Alpha | 1.14 | 1.15 |
451451
| `ServerSideApply` | `true` | Beta | 1.16 | 1.21 |
452452
| `ServerSideApply` | `true` | GA | 1.22 | - |
453+
| `ServerSideFieldValidation` | `false` | Alpha | 1.23 | - |
453454
| `ServiceAccountIssuerDiscovery` | `false` | Alpha | 1.18 | 1.19 |
454455
| `ServiceAccountIssuerDiscovery` | `true` | Beta | 1.20 | 1.20 |
455456
| `ServiceAccountIssuerDiscovery` | `true` | GA | 1.21 | - |
@@ -1088,6 +1089,9 @@ Each feature gate is designed for enabling/disabling a specific feature:
10881089
cache to accelerate list operations.
10891090
- `ServerSideApply`: Enables the [Sever Side Apply (SSA)](/docs/reference/using-api/server-side-apply/)
10901091
feature on the API Server.
1092+
- `ServerSideFieldValidation`: Enables server-side field validation. This means the validation
1093+
of resource schema is performed at the API server side rather than the client side
1094+
(for example, the `kubectl create` or `kubectl apply` command line).
10911095
- `ServiceAccountIssuerDiscovery`: Enable OIDC discovery endpoints (issuer and
10921096
JWKS URLs) for the service account issuer in the API server. See
10931097
[Configure Service Accounts for Pods](/docs/tasks/configure-pod-container/configure-service-account/#service-account-issuer-discovery)
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: shuffle sharding
2+
title: Shuffle-sharding
33
id: shuffle-sharding
44
date: 2020-03-04
55
full_link:
@@ -18,28 +18,28 @@ We are often concerned with insulating different flows of requests
1818
from each other, so that a high-intensity flow does not crowd out low-intensity flows.
1919
A simple way to put requests into queues is to hash some
2020
characteristics of the request, modulo the number of queues, to get
21-
the index of the queue to use. The hash function uses as input
22-
characteristics of the request that align with flows. For example, in
21+
the index of the queue to use. The hash function uses as input
22+
characteristics of the request that align with flows. For example, in
2323
the Internet this is often the 5-tuple of source and destination
2424
address, protocol, and source and destination port.
2525

2626
That simple hash-based scheme has the property that any high-intensity flow
2727
will crowd out all the low-intensity flows that hash to the same queue.
2828
Providing good insulation for a large number of flows requires a large
29-
number of queues, which is problematic. Shuffle sharding is a more
29+
number of queues, which is problematic. Shuffle-sharding is a more
3030
nimble technique that can do a better job of insulating the low-intensity
31-
flows from the high-intensity flows. The terminology of shuffle sharding uses
31+
flows from the high-intensity flows. The terminology of shuffle-sharding uses
3232
the metaphor of dealing a hand from a deck of cards; each queue is a
33-
metaphorical card. The shuffle sharding technique starts with hashing
33+
metaphorical card. The shuffle-sharding technique starts with hashing
3434
the flow-identifying characteristics of the request, to produce a hash
35-
value with dozens or more of bits. Then the hash value is used as a
35+
value with dozens or more of bits. Then the hash value is used as a
3636
source of entropy to shuffle the deck and deal a hand of cards
37-
(queues). All the dealt queues are examined, and the request is put
38-
into one of the examined queues with the shortest length. With a
37+
(queues). All the dealt queues are examined, and the request is put
38+
into one of the examined queues with the shortest length. With a
3939
modest hand size, it does not cost much to examine all the dealt cards
4040
and a given low-intensity flow has a good chance to dodge the effects of a
41-
given high-intensity flow. With a large hand size it is expensive to examine
41+
given high-intensity flow. With a large hand size it is expensive to examine
4242
the dealt queues and more difficult for the low-intensity flows to dodge the
43-
collective effects of a set of high-intensity flows. Thus, the hand size
43+
collective effects of a set of high-intensity flows. Thus, the hand size
4444
should be chosen judiciously.
4545

content/en/docs/tasks/tls/managing-tls-in-a-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ kubectl create secret tls server --cert server.crt --key server-key.pem
308308
secret/server created
309309
```
310310

311-
Finally, you can populate `ca.pem` into a {< glossary_tooltip text="ConfigMap" term_id="configmap" >}}
311+
Finally, you can populate `ca.pem` into a {{< glossary_tooltip text="ConfigMap" term_id="configmap" >}}
312312
and use it as the trust root to verify the serving certificate:
313313

314314
```shell

content/en/examples/admin/logging/two-files-counter-pod-streaming-sidecar.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ spec:
2323
mountPath: /var/log
2424
- name: count-log-1
2525
image: busybox:1.28
26-
args: [/bin/sh, -c, 'tail -n+1 -f /var/log/1.log']
26+
args: [/bin/sh, -c, 'tail -n+1 -F /var/log/1.log']
2727
volumeMounts:
2828
- name: varlog
2929
mountPath: /var/log
3030
- name: count-log-2
3131
image: busybox:1.28
32-
args: [/bin/sh, -c, 'tail -n+1 -f /var/log/2.log']
32+
args: [/bin/sh, -c, 'tail -n+1 -F /var/log/2.log']
3333
volumeMounts:
3434
- name: varlog
3535
mountPath: /var/log

content/id/docs/concepts/extend-kubernetes/service-catalog.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ dengan nama `topic` ke dalam _environment variable_ `TOPIC`.
275275
ke dalam klaster Kubernetes. Alternatif lain, kamu dapat [memasang Service Catalog dengan SC tool](/docs/tasks/service-catalog/install-service-catalog-using-sc/).
276276
* Lihat [contoh makelar servis](https://github.com/openservicebrokerapi/servicebroker/blob/master/gettingStarted.md#sample-service-brokers).
277277
* Pelajari mengenai [kubernetes-incubator/service-catalog](https://github.com/kubernetes-incubator/service-catalog) proyek.
278-
* Lihat [svc-cat.io](https://svc-cat.io/docs/).
279278

280279

281280

0 commit comments

Comments
 (0)