Skip to content

Commit 390b517

Browse files
Merge branch 'kubernetes:main' into GitRepoVolume
2 parents e79296d + 898cbe1 commit 390b517

File tree

237 files changed

+14199
-1954
lines changed

Some content is hidden

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

237 files changed

+14199
-1954
lines changed

OWNERS_ALIASES

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ aliases:
4949
- windsonsea
5050
sig-docs-es-owners: # Admins for Spanish content
5151
- 92nqb
52-
- krol3
5352
- electrocucaracha
53+
- krol3
5454
- raelga
5555
- ramrodo
5656
sig-docs-es-reviews: # PR reviews for Spanish content
5757
- 92nqb
58-
- krol3
5958
- electrocucaracha
59+
- jossemarGT
60+
- krol3
6061
- raelga
6162
- ramrodo
6263
sig-docs-fr-owners: # Admins for French content

README-vi.md

Lines changed: 173 additions & 31 deletions
Large diffs are not rendered by default.

assets/scss/_custom.scss

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,31 @@ body.td-404 main .error-details {
239239
}
240240
}
241241

242+
.search-item.nav-item {
243+
input, input::placeholder {
244+
color: black;
245+
}
246+
}
247+
248+
.flip-nav .search-item {
249+
.td-search-input, .search-bar {
250+
background-color: $medium-grey;
251+
}
252+
input, input::placeholder, .search-icon {
253+
color: white;
254+
}
255+
textarea:focus, input:focus {
256+
color: white;
257+
}
258+
}
259+
260+
@media only screen and (max-width: 1500px) {
261+
header nav .search-item {
262+
display: none;
263+
}
264+
}
265+
266+
242267
/* FOOTER */
243268
footer {
244269
background-color: #303030;
@@ -732,6 +757,8 @@ body.td-documentation {
732757
}
733758
}
734759

760+
/* Announcements */
761+
735762
#announcement {
736763
> * {
737764
color: inherit;
@@ -753,10 +780,21 @@ body.td-documentation {
753780
padding-top: 40px;
754781
}
755782

783+
// Don't show announcements when javascript is not available
784+
785+
html.no-js body div#announcement {
786+
display: none;
787+
}
788+
789+
#announcement.display-announcement{
790+
display: block; // apply this class to display the announcement
791+
}
792+
756793
#announcement {
757794
// default background is blue; overrides are possible
758795
color: #fff;
759-
796+
display: none; // When javascript is available, Let javascript handle the state of the announcement
797+
760798
.announcement-main {
761799
margin-left: auto;
762800
margin-right: auto;
@@ -1037,4 +1075,4 @@ div.alert > em.javascript-required {
10371075
border: none;
10381076
outline: none;
10391077
padding: .5em 0 .5em 0;
1040-
}
1078+
}

content/de/docs/concepts/containers/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
title: "Container"
33
weight: 40
44
description: >
5-
Methoden, um Anwendungen und ihre Abhängigkeiten zu zusammenzufassen.
5+
Methoden, um Anwendungen und ihre Abhängigkeiten zusammenzufassen.
66
---
77

content/de/docs/tutorials/kubernetes-basics/_index.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,25 @@ <h2>Kubernetes Grundlagen Module</h2>
5050
<div class="row">
5151
<div class="col-md-4">
5252
<div class="thumbnail">
53-
<a href="/docs/tutorials/kubernetes-basics/create-cluster/cluster-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_01.svg?v=1469803628347" alt=""></a>
53+
<a href="/de/docs/tutorials/kubernetes-basics/create-cluster/cluster-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_01.svg?v=1469803628347" alt=""></a>
5454
<div class="caption">
55-
<a href="/docs/tutorials/kubernetes-basics/create-cluster/cluster-intro/"><h5>1. Erstellen Sie einen Kubernetes-Cluster</h5></a>
55+
<a href="/de/docs/tutorials/kubernetes-basics/create-cluster/cluster-intro/"><h5>1. Erstellen Sie einen Kubernetes-Cluster</h5></a>
5656
</div>
5757
</div>
5858
</div>
5959
<div class="col-md-4">
6060
<div class="thumbnail">
61-
<a href="/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_02.svg?v=1469803628347" alt=""></a>
61+
<a href="/de/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_02.svg?v=1469803628347" alt=""></a>
6262
<div class="caption">
63-
<a href="/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro/"><h5>2. Stellen Sie eine App bereit</h5></a>
63+
<a href="/de/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro/"><h5>2. Stellen Sie eine App bereit</h5></a>
6464
</div>
6565
</div>
6666
</div>
6767
<div class="col-md-4">
6868
<div class="thumbnail">
69-
<a href="/docs/tutorials/kubernetes-basics/explore/explore-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_03.svg?v=1469803628347" alt=""></a>
69+
<a href="/de/docs/tutorials/kubernetes-basics/explore/explore-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_03.svg?v=1469803628347" alt=""></a>
7070
<div class="caption">
71-
<a href="/docs/tutorials/kubernetes-basics/explore/explore-intro/"><h5>3. Erkunden Sie Ihre App</h5></a>
71+
<a href="/de/docs/tutorials/kubernetes-basics/explore/explore-intro/"><h5>3. Erkunden Sie Ihre App</h5></a>
7272
</div>
7373
</div>
7474
</div>
@@ -78,25 +78,25 @@ <h2>Kubernetes Grundlagen Module</h2>
7878
<div class="row">
7979
<div class="col-md-4">
8080
<div class="thumbnail">
81-
<a href="/docs/tutorials/kubernetes-basics/expose/expose-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_04.svg?v=1469803628347" alt=""></a>
81+
<a href="/de/docs/tutorials/kubernetes-basics/expose/expose-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_04.svg?v=1469803628347" alt=""></a>
8282
<div class="caption">
83-
<a href="/docs/tutorials/kubernetes-basics/expose/expose-intro/"><h5>4. Machen Sie Ihre App öffentlich zugänglich</h5></a>
83+
<a href="/de/docs/tutorials/kubernetes-basics/expose/expose-intro/"><h5>4. Machen Sie Ihre App öffentlich zugänglich</h5></a>
8484
</div>
8585
</div>
8686
</div>
8787
<div class="col-md-4">
8888
<div class="thumbnail">
89-
<a href="/docs/tutorials/kubernetes-basics/scale/scale-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_05.svg?v=1469803628347" alt=""></a>
89+
<a href="/de/docs/tutorials/kubernetes-basics/scale/scale-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_05.svg?v=1469803628347" alt=""></a>
9090
<div class="caption">
91-
<a href="/docs/tutorials/kubernetes-basics/scale/scale-intro/"><h5>5. Skalieren Sie Ihre App</h5></a>
91+
<a href="/de/docs/tutorials/kubernetes-basics/scale/scale-intro/"><h5>5. Skalieren Sie Ihre App</h5></a>
9292
</div>
9393
</div>
9494
</div>
9595
<div class="col-md-4">
9696
<div class="thumbnail">
97-
<a href="/docs/tutorials/kubernetes-basics/update/update-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_06.svg?v=1469803628347" alt=""></a>
97+
<a href="/de/docs/tutorials/kubernetes-basics/update/update-intro/"><img src="/docs/tutorials/kubernetes-basics/public/images/module_06.svg?v=1469803628347" alt=""></a>
9898
<div class="caption">
99-
<a href="/docs/tutorials/kubernetes-basics/update/update-intro/"><h5>6. Aktualisieren Sie Ihre App</h5></a>
99+
<a href="/de/docs/tutorials/kubernetes-basics/update/update-intro/"><h5>6. Aktualisieren Sie Ihre App</h5></a>
100100
</div>
101101
</div>
102102
</div>
@@ -107,7 +107,7 @@ <h2>Kubernetes Grundlagen Module</h2>
107107

108108
<div class="row">
109109
<div class="col-md-12">
110-
<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/create-cluster/cluster-intro/" role="button">Starten Sie das Tutorial<span class="btn__next"></span></a>
110+
<a class="btn btn-lg btn-success" href="/de/docs/tutorials/kubernetes-basics/create-cluster/cluster-intro/" role="button">Starten Sie das Tutorial<span class="btn__next"></span></a>
111111
</div>
112112
</div>
113113

content/en/blog/_posts/2020-08-03-kubernetes-1-18-release-interview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ It was actually just making— again, startup, small company, small team, so rea
6262

6363
**ADAM GLICK: What time frame was this?**
6464

65-
JORGE ALARCÓN: Three, four years ago, so definitely not 1.13. That's the best guesstimate that I can give at this point. But I wasn't able to find any good examples, any tutorials. The only book that I was able to get my hands on was the one written by Joe Beda, Kelsey Hightower, and I forget the other author. But what is it? "[Kubernetes— Up and Running](](http://shop.oreilly.com/product/0636920223788.do))"?
65+
JORGE ALARCÓN: Three, four years ago, so definitely not 1.13. That's the best guesstimate that I can give at this point. But I wasn't able to find any good examples, any tutorials. The only book that I was able to get my hands on was the one written by Joe Beda, Kelsey Hightower, and I forget the other author. But what is it? "[Kubernetes— Up and Running](http://shop.oreilly.com/product/0636920223788.do)"?
6666

6767
And in general, right now I use it as reference— it's really good. But as a beginner, I still was lost. They give all these amazing examples, they provide the applications, but I had no idea why someone might need a Pod, why someone might need a Deployment. So my last resort was to try and find someone who actually knew Kubernetes.
6868

content/en/blog/_posts/2021-11-12-are-you-ready-for-dockershim-removal/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ time to review the [dockershim migration documentation](/docs/tasks/administer-c
6464
and consult your Kubernetes hosting vendor (if you have one) what container runtime options are available for you.
6565
Read up [container runtime documentation with instructions on how to use containerd and CRI-O](/docs/setup/production-environment/container-runtimes/#container-runtimes)
6666
to help prepare you when you're ready to upgrade to 1.24. CRI-O, containerd, and
67-
Docker with [Mirantis cri-dockerd](https://github.com/Mirantis/cri-dockerd) are
67+
Docker with [Mirantis cri-dockerd](https://mirantis.github.io/cri-dockerd/) are
6868
not the only container runtime options, we encourage you to explore the [CNCF landscape on container runtimes](https://landscape.cncf.io/?group=projects-and-products&view-mode=card#runtime--container-runtime)
6969
in case another suits you better.
7070

content/en/blog/_posts/2022-02-17-updated-dockershim-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Kubernetes clusters. Containers make this kind of interoperability possible.
109109

110110
Mirantis and Docker have [committed][mirantis] to maintaining a replacement adapter for
111111
Docker Engine, and to maintain that adapter even after the in-tree dockershim is removed
112-
from Kubernetes. The replacement adapter is named [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd).
112+
from Kubernetes. The replacement adapter is named [`cri-dockerd`](https://mirantis.github.io/cri-dockerd/).
113113

114114
You can install `cri-dockerd` and use it to connect the kubelet to Docker Engine. Read [Migrate Docker Engine nodes from dockershim to cri-dockerd](/docs/tasks/administer-cluster/migrating-from-dockershim/migrate-dockershim-dockerd/) to learn more.
115115

content/en/blog/_posts/2023-08-15-pkgs-k8s-io-introduction.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ publishing packages to the Google-hosted repository in the future.
173173
curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
174174
```
175175

176+
_Update: In releases older than Debian 12 and Ubuntu 22.04, the folder `/etc/apt/keyrings` does not exist by default, and it should be created before the curl command._
177+
176178
3. Update the `apt` package index:
177179

178180
```shell

0 commit comments

Comments
 (0)