Skip to content

Commit 7119fa1

Browse files
authored
Merge branch 'master' into patch-1
2 parents 8acfed9 + ebf3d17 commit 7119fa1

File tree

289 files changed

+16547
-12175
lines changed

Some content is hidden

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

289 files changed

+16547
-12175
lines changed

OWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ approvers:
77
- sig-docs-en-owners # Defined in OWNERS_ALIASES
88

99
emeritus_approvers:
10-
- chenopis
11-
- jaredbhatti
10+
# chenopis, you're welcome to return when you're ready to resume PR wrangling
11+
# jaredbhatti, you're welcome to return when you're ready to resume PR wrangling
1212
# stewart-yu, you're welcome to return when you're ready to resume PR wrangling
1313
- stewart-yu
1414

1515
labels:
16-
- sig/docs
16+
- sig/docs

OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ aliases:
4848
- makoscafee
4949
- onlydole
5050
- Rajakavitha1
51+
- savitharaghunathan
5152
- sftim
5253
- steveperry-53
5354
- tengqm

README-uk.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,19 @@
1919
* [Керівництво зі стилю оформлення документації](http://kubernetes.io/docs/contribute/style/style-guide/)
2020
* [Переклад документації Kubernetes іншими мовами](https://kubernetes.io/docs/contribute/localization/)
2121

22+
## Файл `README.md` іншими мовами
23+
24+
| | |
25+
|-------------------------------|-------------------------------|
26+
| [Англійська](README.md) | [Французька](README-fr.md) |
27+
| [Корейська](README-ko.md) | [Німецька](README-de.md) |
28+
| [Португальська](README-pt.md) | [Хінді](README-hi.md) |
29+
| [Іспанська](README-es.md) | [Індонезійська](README-id.md) |
30+
| [Китайська](README-zh.md) | [Японська](README-ja.md) |
31+
| [В'єтнамська](README-vi.md) | [Російська](README-ru.md) |
32+
| [Італійська](README-it.md) | [Польська](README-pl.md) |
33+
| | |
34+
2235
## Запуск сайту локально за допомогою Docker
2336

2437
Для локального запуску сайту Kubernetes рекомендовано запустити спеціальний [Docker](https://docker.com)-образ, що містить генератор статичних сайтів [Hugo](https://gohugo.io).

assets/sass/_desktop.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $main-max-width: 1200px
22
$vendor-strip-height: 44px
33
$video-section-height: 550px
44

5-
@media screen and (min-width: 1025px)
5+
@media screen and (min-width: 1100px)
66
#hamburger
77
display: none
88

content/de/includes/user-guide-migration-notice.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

content/en/blog/_posts/2020-04-02-Improvements-to-the-Ingress-API-in-Kubernetes-1.18.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ The new concept of a path type allows you to specify how a path should be matche
2424
The Ingress resource was designed with simplicity in mind, providing a simple set of fields that would be applicable in all use cases. Over time, as use cases evolved, implementations began to rely on a long list of custom annotations for further configuration. The new `IngressClass` resource provides a way to replace some of those annotations.
2525

2626
Each `IngressClass` specifies which controller should implement Ingresses of the class and can reference a custom resource with additional parameters.
27-
```
28-
apiVersion: networking.k8s.io/v1beta1
29-
kind: IngressClass
27+
```yaml
28+
apiVersion: "networking.k8s.io/v1beta1"
29+
kind: "IngressClass"
3030
metadata:
31-
name: external-lb
31+
name: "external-lb"
3232
spec:
33-
controller: example.com/ingress-controller
33+
controller: "example.com/ingress-controller"
3434
parameters:
35-
apiGroup: k8s.example.com/v1alpha
36-
kind: IngressParameters
37-
name: external-lb
35+
apiGroup: "k8s.example.com/v1alpha"
36+
kind: "IngressParameters"
37+
name: "external-lb"
3838
```
3939
4040
### Specifying the Class of an Ingress
@@ -60,21 +60,21 @@ Many Ingress providers have supported wildcard hostname matching like `*.foo.com
6060
### Putting it All Together
6161
These new Ingress features allow for much more configurability. Here’s an example of an Ingress that makes use of pathType, `ingressClassName`, and a hostname wildcard:
6262

63-
```
64-
apiVersion: networking.k8s.io/v1beta1
65-
kind: Ingress
63+
```yaml
64+
apiVersion: "networking.k8s.io/v1beta1"
65+
kind: "Ingress"
6666
metadata:
67-
name: example-ingress
67+
name: "example-ingress"
6868
spec:
69-
ingressClassName: external-lb
69+
ingressClassName: "external-lb"
7070
rules:
71-
- host: *.example.com
71+
- host: "*.example.com"
7272
http:
7373
paths:
74-
- path: /example
75-
pathType: Prefix
74+
- path: "/example"
75+
pathType: "Prefix"
7676
backend:
77-
serviceName: example-service
77+
serviceName: "example-service"
7878
servicePort: 80
7979
```
8080

content/en/docs/concepts/architecture/cloud-controller.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ The following cloud providers have implemented CCMs:
231231
* [DigitalOcean](https://github.com/digitalocean/digitalocean-cloud-controller-manager)
232232
* [GCP](https://github.com/kubernetes/cloud-provider-gcp)
233233
* [Hetzner](https://github.com/hetznercloud/hcloud-cloud-controller-manager)
234+
* [HUAWEI CLOUD](https://github.com/kubernetes-sigs/cloud-provider-huaweicloud)
234235
* [Linode](https://github.com/linode/linode-cloud-controller-manager)
235236
* [OpenStack](https://github.com/kubernetes/cloud-provider-openstack)
236237
* [Oracle](https://github.com/oracle/oci-cloud-controller-manager)

content/en/docs/concepts/architecture/controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Job is a Kubernetes resource that runs a
5252
{{< glossary_tooltip term_id="pod" >}}, or perhaps several Pods, to carry out
5353
a task and then stop.
5454

55-
(Once [scheduled](/docs/concepts/scheduling/), Pod objects become part of the
55+
(Once [scheduled](/docs/concepts/scheduling-eviction/), Pod objects become part of the
5656
desired state for a kubelet).
5757

5858
When the Job controller sees a new task it makes sure that, somewhere

content/en/docs/concepts/cluster-administration/manage-deployment.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ deployment.apps/my-deployment created
140140
persistentvolumeclaim/my-pvc created
141141
```
142142

143-
The `--recursive` flag works with any operation that accepts the `--filename,-f` flag such as: `kubectl {create,get,delete,describe,rollout} etc.`
143+
The `--recursive` flag works with any operation that accepts the `--filename,-f` flag such as: `kubectl {create,get,delete,describe,rollout}` etc.
144144

145145
The `--recursive` flag also works when multiple `-f` arguments are provided:
146146

@@ -453,7 +453,7 @@ That's it! The Deployment will declaratively update the deployed nginx applicati
453453

454454
{{% capture whatsnext %}}
455455

456-
- [Learn about how to use `kubectl` for application introspection and debugging.](/docs/tasks/debug-application-cluster/debug-application-introspection/)
457-
- [Configuration Best Practices and Tips](/docs/concepts/configuration/overview/)
456+
- Learn about [how to use `kubectl` for application introspection and debugging](/docs/tasks/debug-application-cluster/debug-application-introspection/).
457+
- See [Configuration Best Practices and Tips](/docs/concepts/configuration/overview/).
458458

459459
{{% /capture %}}

0 commit comments

Comments
 (0)