Skip to content

Commit b1ae40c

Browse files
Merge pull request #1 from kubernetes/master
Synch from kubernetes
2 parents 1780702 + b1a0b1a commit b1ae40c

File tree

242 files changed

+60073
-4379
lines changed

Some content is hidden

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

242 files changed

+60073
-4379
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ Note that code issues should be filed against the main kubernetes repository, wh
3535
### Submitting Documentation Pull Requests
3636

3737
If you're fixing an issue in the existing documentation, you should submit a PR against the master branch. Follow [these instructions to create a documentation pull request against the kubernetes.io repository](http://kubernetes.io/docs/home/contribute/create-pull-request/).
38+
39+
For more information, see [contributing to Kubernetes docs](https://kubernetes.io/docs/contribute/).

OWNERS_ALIASES

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ aliases:
2727
- jimangel
2828
- kbarnard10
2929
- kbhawkey
30-
- makoscafee
3130
- onlydole
3231
- savitharaghunathan
3332
- sftim
@@ -43,7 +42,6 @@ aliases:
4342
- jimangel
4443
- kbarnard10
4544
- kbhawkey
46-
- makoscafee
4745
- onlydole
4846
- rajeshdeshpande02
4947
- sftim

README-ru.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ hugo server --buildFuture
3838
Узнать подробнее о том, как поучаствовать в документации Kubernetes, вы можете по ссылкам ниже:
3939

4040
* [Начните вносить свой вклад](https://kubernetes.io/docs/contribute/)
41-
* [Использование шаблонов страниц](http://kubernetes.io/docs/contribute/style/page-templates/)
42-
* [Руководство по оформлению документации](http://kubernetes.io/docs/contribute/style/style-guide/)
41+
* [Использование шаблонов страниц](https://kubernetes.io/docs/contribute/style/page-content-types/)
42+
* [Руководство по оформлению документации](https://kubernetes.io/docs/contribute/style/style-guide/)
4343
* [Руководство по локализации Kubernetes](https://kubernetes.io/docs/contribute/localization/)
4444

4545
## Файл `README.md` на других языках

assets/js/search.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ limitations under the License.
2323
}
2424

2525
var query = $(this).val();
26-
var searchPage = "{{ "docs/search/" | absURL }}?q=" + query;
27-
document.location = searchPage;
26+
document.location = "{{ "search/" | absURL }}?q=" + query;
2827

2928
return false;
3029
});

assets/scss/_custom.scss

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -268,22 +268,34 @@ main {
268268

269269
// blockquotes and callouts
270270

271-
blockquote {
272-
padding: 0.4rem 0.4rem 0.4rem 1rem !important;
273-
}
274-
275-
// callouts are contained in static CSS as well. these require override.
271+
.td-content, body {
272+
blockquote.callout {
273+
padding: 0.4rem 0.4rem 0.4rem 1rem;
274+
border: 1px solid #eee;
275+
border-left-width: 0.5em;
276+
background: #fff;
277+
color: #000;
278+
margin-top: 0.5em;
279+
margin-bottom: 0.5em;
280+
}
281+
blockquote.callout {
282+
border-radius: calc(1em/3);
283+
}
284+
.callout.caution {
285+
border-left-color: #f0ad4e;
286+
}
276287

277-
.caution {
278-
border-left-color: #f0ad4e !important;
279-
}
288+
.callout.note {
289+
border-left-color: #428bca;
290+
}
280291

281-
.note {
282-
border-left-color: #428bca !important;
283-
}
292+
.callout.warning {
293+
border-left-color: #d9534f;
294+
}
284295

285-
.warning {
286-
border-left-color: #d9534f !important;
296+
h1:first-of-type + blockquote.callout {
297+
margin-top: 1.5em;
298+
}
287299
}
288300

289301
.deprecation-warning {

config.toml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ time_format_blog = "Monday, January 02, 2006"
115115
description = "Production-Grade Container Orchestration"
116116
showedit = true
117117

118-
latest = "v1.18"
118+
latest = "v1.19"
119119

120-
fullversion = "v1.18.0"
121-
version = "v1.18"
120+
fullversion = "v1.19.0"
121+
version = "v1.19"
122122
githubbranch = "master"
123123
docsbranch = "master"
124124
deprecated = false
@@ -157,39 +157,40 @@ js = [
157157
]
158158

159159
[[params.versions]]
160-
fullversion = "v1.18.0"
160+
fullversion = "v1.19.0"
161+
version = "v1.19"
162+
githubbranch = "v1.19.0"
163+
docsbranch = "master"
164+
url = "https://kubernetes.io"
165+
166+
[[params.versions]]
167+
fullversion = "v1.18.8"
161168
version = "v1.18"
162-
githubbranch = "v1.18.0"
169+
githubbranch = "v1.18.8"
163170
docsbranch = "release-1.18"
164-
url = "https://kubernetes.io"
171+
url = "https://v1-18.docs.kubernetes.io"
165172

166173
[[params.versions]]
167-
fullversion = "v1.17.4"
174+
fullversion = "v1.17.11"
168175
version = "v1.17"
169-
githubbranch = "v1.17.4"
176+
githubbranch = "v1.17.11"
170177
docsbranch = "release-1.17"
171178
url = "https://v1-17.docs.kubernetes.io"
172179

173180
[[params.versions]]
174-
fullversion = "v1.16.8"
181+
fullversion = "v1.16.14"
175182
version = "v1.16"
176-
githubbranch = "v1.16.8"
183+
githubbranch = "v1.16.14"
177184
docsbranch = "release-1.16"
178185
url = "https://v1-16.docs.kubernetes.io"
179186

180187
[[params.versions]]
181-
fullversion = "v1.15.11"
188+
fullversion = "v1.15.12"
182189
version = "v1.15"
183-
githubbranch = "v1.15.11"
190+
githubbranch = "v1.15.12"
184191
docsbranch = "release-1.15"
185192
url = "https://v1-15.docs.kubernetes.io"
186193

187-
[[params.versions]]
188-
fullversion = "v1.14.10"
189-
version = "v1.14"
190-
githubbranch = "v1.14.10"
191-
docsbranch = "release-1.14"
192-
url = "https://v1-14.docs.kubernetes.io"
193194

194195
# User interface configuration
195196
[params.ui]

content/de/docs/reference/kubectl/cheatsheet.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ KUBECONFIG=~/.kube/config:~/.kube/kubconfig2 kubectl config view
5454
# Zeigen Sie das Passwort für den e2e-Benutzer an
5555
kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'
5656

57-
kubectl config view -o jsonpath='{.users[].name}' # eine Liste der Benutzer erhalten
57+
kubectl config view -o jsonpath='{.users[].name}' # den ersten Benutzer anzeigen
58+
kubectl config view -o jsonpath='{.users[*].name}' # eine Liste der Benutzer erhalten
5859
kubectl config current-context # den aktuellen Kontext anzeigen
5960
kubectl config use-context my-cluster-name # Setzen Sie den Standardkontext auf my-cluster-name
6061

content/en/_index.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ <h2>The Challenges of Migrating 150+ Microservices to Kubernetes</h2>
4141
<button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
4242
<br>
4343
<br>
44-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu20" button id="desktopKCButton">Attend KubeCon EU virtually on August 17-20, 2020</a>
45-
<br>
46-
<br>
47-
<br>
48-
<br>
4944
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccncna20" button id="desktopKCButton">Attend KubeCon NA virtually on November 17-20, 2020</a>
5045
</div>
5146
<div id="videoPlayer">

content/en/blog/_posts/2018-06-26-kubernetes-1-11-release-announcement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Support for [dynamic maximum volume count](https://github.com/kubernetes/feature
4545

4646
The StorageObjectInUseProtection feature is now stable and prevents the removal of both [Persistent Volumes](https://github.com/kubernetes/features/issues/499) that are bound to a Persistent Volume Claim, and [Persistent Volume Claims](https://github.com/kubernetes/features/issues/498) that are being used by a pod. This safeguard will help prevent issues from deleting a PV or a PVC that is currently tied to an active pod.
4747

48-
Each Special Interest Group (SIG) within the community continues to deliver the most-requested enhancements, fixes, and functionality for their respective specialty areas. For a complete list of inclusions by SIG, please visit the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#111-release-notes).
48+
Each Special Interest Group (SIG) within the community continues to deliver the most-requested enhancements, fixes, and functionality for their respective specialty areas. For a complete list of inclusions by SIG, please visit the [release notes](https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md#111-release-notes).
4949

5050
## Availability
5151

@@ -88,7 +88,7 @@ Is Kubernetes helping your team? Share your story with the community.
8888
* The CNCF recently expanded its certification offerings to include a Certified Kubernetes Application Developer exam. The CKAD exam certifies an individual's ability to design, build, configure, and expose cloud native applications for Kubernetes. More information can be found [here](https://www.cncf.io/blog/2018/03/16/cncf-announces-ckad-exam/).
8989
* The CNCF recently added a new partner category, Kubernetes Training Partners (KTP). KTPs are a tier of vetted training providers who have deep experience in cloud native technology training. View partners and learn more [here](https://www.cncf.io/certification/training/).
9090
* CNCF also offers [online training](https://www.cncf.io/certification/training/) that teaches the skills needed to create and configure a real-world Kubernetes cluster.
91-
* Kubernetes documentation now features [user journeys](https://k8s.io/docs/home/): specific pathways for learning based on who readers are and what readers want to do. Learning Kubernetes is easier than ever for beginners, and more experienced users can find task journeys specific to cluster admins and application developers.
91+
* Kubernetes documentation now features [user journeys](https://k8s.io/docs/home/): specific pathways for learning based on who readers are and what readers want to do. Learning Kubernetes is easier than ever for beginners, and more experienced users can find task journeys specific to cluster admins and application developers.
9292

9393
## KubeCon
9494

0 commit comments

Comments
 (0)