Skip to content

Commit 8728d7d

Browse files
authored
Merge pull request #47124 from MaryamTavakkoli/merged-main-dev-1.31
Merged main dev 1.31
2 parents dea8689 + a5fcf3c commit 8728d7d

File tree

50 files changed

+4920
-889
lines changed

Some content is hidden

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

50 files changed

+4920
-889
lines changed

README-uk.md

Lines changed: 176 additions & 53 deletions
Large diffs are not rendered by default.

assets/js/search.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ limitations under the License.
3232
}
3333

3434
var query = $(this).val();
35-
document.location = "{{ "search/" | absURL }}?q=" + query;
35+
var searchPage = $(this).data('search-page') + "?q=" + query;
36+
document.location = searchPage;
3637

3738
return false;
3839
});

assets/scss/_custom.scss

Lines changed: 59 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,29 +1324,6 @@ div.alert > em.javascript-required {
13241324
background: #326de6;
13251325
}
13261326

1327-
// Adjust Bing search result page
1328-
#bing-results-container {
1329-
padding: 1em;
1330-
}
1331-
.bing-result {
1332-
margin-bottom: 1em;
1333-
}
1334-
.bing-result-url {
1335-
font-size: 14px;
1336-
}
1337-
.bing-result-snippet {
1338-
color: #666666;
1339-
font-size: 14px;
1340-
}
1341-
#bing-pagination-container {
1342-
padding: 1em;
1343-
margin-bottom: 1em;
1344-
1345-
a.bing-page-anchor {
1346-
padding: 0.5em;
1347-
margin: 0.25em;
1348-
}
1349-
}
13501327

13511328
// Adjust Search-bar search-icon
13521329
.search-bar {
@@ -1378,6 +1355,65 @@ div.alert > em.javascript-required {
13781355
padding: .5em 0 .5em 0;
13791356
}
13801357

1358+
// PageFind Styles
1359+
1360+
#search .pagefind-ui form input {
1361+
background-color: #fff;
1362+
border: 1px solid #4c4c4c;
1363+
border-radius: 20px;
1364+
overflow-x: hidden;
1365+
width: auto;
1366+
padding: 6px 10px !important;
1367+
margin: 20px 10px 20px 0;
1368+
1369+
&:focus-within {
1370+
outline: 1.5px solid rgba(47, 135, 223, 0.7);
1371+
border: 1px solid rgba(47, 135, 223, 0.7);
1372+
}
1373+
}
1374+
1375+
#search .pagefind-ui ol.pagefind-ui__results {
1376+
padding-left: 0;
1377+
}
1378+
1379+
#search .pagefind-ui .pagefind-ui__result-nested {
1380+
padding-left: 2em;
1381+
}
1382+
1383+
#search .pagefind-ui.pagefind-ui__result-nested::before {
1384+
content: "\2937 ";
1385+
color: $blue;
1386+
}
1387+
1388+
#search .pagefind-ui ol > li {
1389+
list-style-type: none;
1390+
border-top: 1.5px solid rgba(47, 135, 223, 0.7);
1391+
padding: 10px;
1392+
}
1393+
1394+
#search .pagefind-ui button {
1395+
color: #fff;
1396+
background-color: $blue;
1397+
border-radius: 0.2em;
1398+
border: 0.1rem solid $medium-grey;
1399+
padding: 0.3em;
1400+
}
1401+
1402+
#search .pagefind-ui__result-tags {
1403+
font-size: 14px;
1404+
font-weight: 400;
1405+
}
1406+
1407+
#search a.pagefind-ui__result-link {
1408+
font-weight: 700;
1409+
font-size: 1.15rem;
1410+
}
1411+
1412+
body.td-search #search {
1413+
margin-top: 1rem;
1414+
margin-bottom: 3rem;
1415+
}
1416+
13811417
/* CSS for 'figure' full-screen display */
13821418

13831419
/* Define styles for full-screen overlay */
@@ -1421,89 +1457,6 @@ div.alert > em.javascript-required {
14211457
padding: 0.2rem;
14221458
}
14231459

1424-
// Special style for Kubernetes' 10th birthday
1425-
section.k8s-birthday-override {
1426-
background: #dae9f9; // Kubernetes light blue
1427-
1428-
> .k8s-birthday-wrapper {
1429-
display: flex;
1430-
flex-direction: row;
1431-
justify-content: center;
1432-
align-items: center;
1433-
align-content: flex-end;
1434-
gap: 2rem;
1435-
1436-
img.birthday-banner {
1437-
max-height: 20rem;
1438-
max-width: 100vw;
1439-
margin-left: auto;
1440-
margin-right: auto;
1441-
aspect-ratio: 1;
1442-
flex-grow: 1;
1443-
}
1444-
p {
1445-
flex-grow: 4;
1446-
text-align: center;
1447-
color: $blue;
1448-
font-size: 2.5em;
1449-
padding-bottom: 2.5rem;
1450-
margin: 1em;
1451-
}
1452-
}
1453-
1454-
div.k8s-birthday-override.revert-to-previous {
1455-
form {
1456-
display: block;
1457-
max-width: clamp(20rem, 30%, 100vw);
1458-
margin-left: auto;
1459-
padding-bottom: 0.5rem;
1460-
}
1461-
text-align: right;
1462-
label {
1463-
color: $blue;
1464-
padding-left: 1.2em;
1465-
padding-right: 1.2em;
1466-
text-decoration: underline;
1467-
font-size: 1.5rem;
1468-
}
1469-
input {
1470-
accent-color: $blue;
1471-
border-color: $blue;
1472-
visibility: hidden;
1473-
}
1474-
}
1475-
1476-
div.k8s-birthday-override.revert-to-previous:has(input:not(:checked)) {
1477-
display: initial;
1478-
}
1479-
1480-
&:has(input:checked) {
1481-
display: none;
1482-
}
1483-
}
1484-
1485-
@media screen and (max-width: 900px) {
1486-
section.k8s-birthday-override > .k8s-birthday-wrapper {
1487-
flex-wrap: wrap;
1488-
}
1489-
}
1490-
1491-
@media screen and (max-width: 900px) {
1492-
section.k8s-birthday-override > .k8s-birthday-wrapper {
1493-
gap: 0.2rem;
1494-
align-content: center;
1495-
p {
1496-
font-size: initial;
1497-
min-width: 80vw;
1498-
}
1499-
img.birthday-banner {
1500-
min-height: initial;
1501-
}
1502-
label {
1503-
font-size: 1.2rem;
1504-
}
1505-
}
1506-
}
15071460
@media screen and (max-aspect-ratio: 9/15) {
15081461
gap: 0.4rem;
15091462
}

content/de/docs/tasks/tools/install-kubectl-linux.md

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,17 +163,60 @@ Falls es benötigt wird, kann es angelegt werden. Hierzu sollte es danach von je
163163
{{% /tab %}}
164164

165165
{{% tab name="Red Hat-basierte Distributionen" %}}
166-
```bash
167-
cat <<EOF | sudo tee /etc/yum.repos.d/kubernetes.repo
168-
[kubernetes]
169-
name=Kubernetes
170-
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-\$basearch
171-
enabled=1
172-
gpgcheck=1
173-
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
174-
EOF
175-
sudo yum install -y kubectl
176-
```
166+
167+
1. Hinzufügen des Kubernetes `yum` Repository. Wenn eine andere Kubernetes Version als {{< param "version" >}} installiert werden soll, muss {{< param "version" >}} im unteren Block durch die gewünschte Version ersetzt werden.
168+
169+
```bash
170+
# Bestehende Inhalte in /etc/yum.repos.d/kubernetes.repo werden überschrieben
171+
cat <<EOF | sudo tee /etc/yum.repos.d/kubernetes.repo
172+
[kubernetes]
173+
name=Kubernetes
174+
baseurl=https://pkgs.k8s.io/core:/stable:/{{< param "version" >}}/rpm/
175+
enabled=1
176+
gpgcheck=1
177+
gpgkey=https://pkgs.k8s.io/core:/stable:/{{< param "version" >}}/rpm/repodata/repomd.xml.key
178+
EOF
179+
```
180+
{{< note >}}
181+
Wenn eine andere minor Version von kubectl installiert werden soll muss `/etc/yum.repos.d/kubernetes.repo` angepasst werden
182+
bevor `yum install` ausgeführt wird. Eine genauere Beschreibung findet sich hier
183+
[Wechseln des Kubernetes Package Repository](/docs/tasks/administer-cluster/kubeadm/change-package-repository/).
184+
{{< /note >}}
185+
186+
2. Installieren von kubectl mit Hilfe von `yum`:
187+
188+
```bash
189+
sudo yum install -y kubectl
190+
```
191+
192+
{{% /tab %}}
193+
194+
{{% tab name="SUSE-basierte Distributionen" %}}
195+
1. Hinzufügen des Kubernetes `zypper` Repository. Wenn eine andere Kubernetes Version als {{< param "version" >}} installiert werden soll, muss {{< param "version" >}} im unteren Block durch die gewünschte Version ersetzt werden.
196+
197+
```bash
198+
# Bestehende Inhalte in /etc/zypp/repos.d/kubernetes.repo werden überschrieben
199+
cat <<EOF | sudo tee /etc/zypp/repos.d/kubernetes.repo
200+
[kubernetes]
201+
name=Kubernetes
202+
baseurl=https://pkgs.k8s.io/core:/stable:/{{< param "version" >}}/rpm/
203+
enabled=1
204+
gpgcheck=1
205+
gpgkey=https://pkgs.k8s.io/core:/stable:/{{< param "version" >}}/rpm/repodata/repomd.xml.key
206+
EOF
207+
```
208+
209+
{{< note >}}
210+
Wenn eine andere minor Version von kubectl installiert werden soll muss `/etc/zypp/repos.d/kubernetes.repo` angepasst werden
211+
bevor `zypper update` ausgeführt wird. Eine genauere Beschreibung findet sich hier
212+
[Wechseln des Kubernetes Package Repository](/docs/tasks/administer-cluster/kubeadm/change-package-repository/).
213+
{{< /note >}}
214+
215+
2. Install kubectl using `zypper`:
216+
217+
```bash
218+
sudo zypper install -y kubectl
219+
```
177220
178221
{{% /tab %}}
179222
{{< /tabs >}}

content/en/_index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
{{< site-searchbar >}}
1010

11-
<!-- automatically replaced if Kubernetes birthday feature active -->
1211
{{< blocks/section class="k8s-overview" >}}
1312
{{% blocks/feature image="flower" id="feature-primary" %}}
1413
[Kubernetes]({{< relref "/docs/concepts/overview/" >}}), also known as K8s, is an open source system for automating deployment, scaling, and management of containerized applications.

content/en/blog/_posts/2024-04-22-userns-beta/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ signals to, etc. Furthermore, capabilities granted are only valid inside the
6464
user namespace and not on the host, limiting the impact a container
6565
escape can have.
6666

67-
{{< figure src="/images/blog/2024-04-22-userns-beta/userns-ids.png" alt="Image showing IDs 0-65535 are reserved to the host, pods use higher IDs" title="User namespace IDs allocation" >}}
68-
67+
{{< figure src="/images/blog/2024-04-22-userns-beta/image.svg" alt="Image showing IDs 0-65535 are reserved to the host, pods use higher IDs" title="User namespace IDs allocation" class="diagram-medium" >}}
6968

7069
Without using a user namespace, a container running as root in the case of a
7170
container breakout has root privileges on the node. If some capabilities

content/en/community/special/kubernetes-10th-birthday.md

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

content/en/docs/concepts/cluster-administration/flow-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ API Priority and Fairness feature.
7070
## Recursive server scenarios
7171

7272
API Priority and Fairness must be used carefully in recursive server
73-
scenarios. These are sccenarios in which some server A, while serving
73+
scenarios. These are scenarios in which some server A, while serving
7474
a request, issues a subsidiary request to some server B. Perhaps
7575
server B might even make a further subsidiary call back to server
7676
A. In situations where Priority and Fairness control is applied to

content/en/docs/concepts/overview/kubernetes-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Without indicating the resource type using the `Accept` header, the default
8686
response for the `/api` and `/apis` endpoint is an unaggregated discovery
8787
document.
8888

89-
The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2.json)
89+
The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2beta1.json)
9090
for the built-in resources can be found in the Kubernetes GitHub repository.
9191
This Github document can be used as a reference of the base set of the available resources
9292
if a Kubernetes cluster is not available to query.

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ description: >
77

88
## The Kubernetes network model
99

10-
Every [`Pod`](/docs/concepts/workloads/pods/) in a cluster gets its own unique cluster-wide IP address.
10+
Every [`Pod`](/docs/concepts/workloads/pods/) in a cluster gets its own unique cluster-wide IP address
11+
(one address per IP address family).
1112
This means you do not need to explicitly create links between `Pods` and you
1213
almost never need to deal with mapping container ports to host ports.
1314
This creates a clean, backwards-compatible model where `Pods` can be treated
@@ -23,9 +24,9 @@ implementation (barring any intentional network segmentation policies):
2324
* agents on a node (e.g. system daemons, kubelet) can communicate with all
2425
pods on that node
2526

26-
Note: For those platforms that support `Pods` running in the host network (e.g.
27-
Linux), when pods are attached to the host network of a node they can still communicate
28-
with all pods on all nodes without NAT.
27+
{{< note >}}
28+
For those platforms that support `Pods` running in the host network (such as Linux), when pods are attached to the host network of a node they can still communicate with all pods on all nodes without NAT.
29+
{{< /note >}}
2930

3031
This model is not only less complex overall, but it is principally compatible
3132
with the desire for Kubernetes to enable low-friction porting of apps from VMs

0 commit comments

Comments
 (0)