Skip to content

Commit ae1af38

Browse files
committed
Merge main into dev-1.32 to keep in sync
2 parents e132a42 + a2a9d5d commit ae1af38

File tree

72 files changed

+3521
-504
lines changed

Some content is hidden

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

72 files changed

+3521
-504
lines changed

OWNERS_ALIASES

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ aliases:
1616
- salaxander
1717
- sftim
1818
- tengqm
19-
- drewhagen # RT 1.31 temp acting Docs lead
2019
sig-docs-localization-owners: # Admins for localization content
2120
- a-mccarthy
2221
- divya-mohan0209
@@ -64,8 +63,7 @@ aliases:
6463
- salaxander
6564
- sftim
6665
- tengqm
67-
- Princesso # RT 1.31 Docs Lead
68-
- drewhagen # RT 1.31 temp acting Docs lead
66+
- chanieljdan # RT 1.32 Docs Lead
6967
sig-docs-en-reviews: # PR reviews for English content
7068
- dipesh-rawat
7169
- divya-mohan0209
@@ -81,8 +79,8 @@ aliases:
8179
- shannonxtreme
8280
- tengqm
8381
- windsonsea
84-
- Princesso # RT 1.31 Docs Lead
85-
- drewhagen # RT 1.31 temp acting Docs lead
82+
- Princesso
83+
- drewhagen
8684
sig-docs-es-owners: # Admins for Spanish content
8785
- electrocucaracha
8886
- krol3
@@ -228,12 +226,12 @@ aliases:
228226
- MaxymVlasov
229227
# authoritative source: git.k8s.io/community/OWNERS_ALIASES
230228
committee-steering: # provide PR approvals for announcements
231-
- bentheelder
229+
- aojea
230+
- BenTheElder
232231
- justaugustus
233-
- mrbobbytables
234232
- pacoxu
235-
- palnabarun
236233
- pohly
234+
- saschagrunert
237235
- soltysh
238236
# authoritative source: https://git.k8s.io/sig-release/OWNERS_ALIASES
239237
sig-release-leads:

README-ja.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
169169

170170
## ドキュメントに貢献する {#contributing-to-the-docs}
171171

172-
GitHubの画面右上にある**Fork**ボタンをクリックすると、GitHubアカウントに紐付いた本リポジトリのコピーが作成されます。このコピーのことを*フォーク*と呼びます。フォークリポジトリの中では好きなように変更を加えることができます。加えた変更をこのリポジトリに反映したい好きなタイミングで、フォークリポジトリからPull Reqeustを作成してください
172+
GitHubの画面右上にある**Fork**ボタンをクリックすると、GitHubアカウントに紐付いた本リポジトリのコピーが作成されます。このコピーのことを*フォーク*と呼びます。フォークリポジトリの中では好きなように変更を加えることができます。加えた変更をこのリポジトリに反映したい好きなタイミングで、フォークリポジトリからPull Requestを作成してください
173173

174174
Pull Requestが作成されると、レビュー担当者が責任を持って明確かつ実用的なフィードバックを返します。Pull Requestの所有者は作成者であるため、**自分自身で作成したPull Requestを編集し、フィードバックに対応するのはあなたの責任です。**
175175

assets/scss/_base.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,11 @@ section#cncf {
893893
}
894894
}
895895

896+
footer.row {
897+
margin-left: initial;
898+
margin-right: initial;
899+
}
900+
896901
/* DOCUMENTATION */
897902

898903
// nav-tabs and tab-content

assets/scss/_custom.scss

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,26 @@ body.td-404 main .error-details {
266266

267267
/* FOOTER */
268268
footer {
269-
background-color: #303030;
269+
background-color: #202020;
270+
/* darkened later in this file */
270271
background-image: url("/images/texture.png");
271272
padding: 1rem !important;
272273
min-height: initial !important;
274+
justify-content: center;
273275

274276
> div, > p {
275277
max-width: 95%;
276278
@media only screen and (min-width: 768px) {
277279
max-width: calc(min(80rem,90vw)); // avoid spreading too wide
278280
}
281+
color: inherit;
282+
background: transparent;
283+
284+
a:hover {
285+
color: inherit;
286+
background: transparent;
287+
text-decoration: underline;
288+
}
279289
}
280290

281291
> .footer__links {
@@ -313,6 +323,50 @@ footer {
313323
}
314324
}
315325

326+
footer {
327+
background-image: linear-gradient(rgba(0, 0, 0, 0.527),rgba(0, 0, 0, 0.5)) , url("/images/texture.png");
328+
color: #e9e9e9;
329+
}
330+
331+
// Custom footer sizing
332+
@media (min-width: 800px) and (max-width: 1279px) {
333+
footer {
334+
ul.footer-icons {
335+
min-width: 17.5vw;
336+
display: flex;
337+
flex-wrap: nowrap;
338+
flex-direction: row;
339+
justify-content: space-evenly;
340+
}
341+
.col-sm-2 {
342+
flex: 0 0 22.5%;
343+
max-width: 22.5%;
344+
}
345+
.footer-main.text-center {
346+
flex: 0 0 50%;
347+
max-width: 50%;
348+
}
349+
350+
}
351+
}
352+
353+
354+
@media (max-width: 799px) {
355+
footer ul.footer-icons {
356+
display: flex;
357+
flex-wrap: nowrap;
358+
flex-direction: column;
359+
align-items: flex-start;
360+
row-gap: 0.5em;
361+
}
362+
footer div.order-1 ul.footer-icons {
363+
margin-left: auto;
364+
}
365+
footer div.order-3 ul.footer-icons {
366+
margin-right: auto;
367+
}
368+
}
369+
316370
/* SIDE-DRAWER MENU */
317371

318372
.pi-pushmenu .sled {

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Um kubectl auf Linux zu installieren, gibt es die folgenden Möglichkeiten:
127127

128128
```shell
129129
sudo apt-get update
130-
sudo apt-get install -y ca-certificates curl
130+
sudo apt-get install -y ca-certificates curl gnupg
131131
```
132132

133133
Falls Debian 9 (stretch) oder älter genutzt wird, müssen zusätzlich das Paket `apt-transport-https` installiert werden:
@@ -136,16 +136,20 @@ Um kubectl auf Linux zu installieren, gibt es die folgenden Möglichkeiten:
136136
sudo apt-get install -y apt-transport-https
137137
```
138138

139-
2. Den öffentlichen Google Cloud Signaturschlüssel herunterladen:
139+
2. Den öffentlichen Signaturschlüssel für die Kubernetes Repositories herunterladen:
140140

141141
```shell
142-
curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-archive-keyring.gpg
142+
# Falls der Ordner `/etc/apt/keyrings` nicht existiert, sollte er vor dem curl Kommando erstellt werden, siehe folgende Zeile
143+
# sudo mkdir -p -m 755 /etc/apt/keyrings
144+
curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.31/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
145+
sudo chmod 644 /etc/apt/keyrings/kubernetes-apt-keyring.gpg # nicht privilegierten APT Applikationen den Lesezugriff auf diesen Keyring erlauben
143146
```
144147

145-
3. Kubernetes zum `apt` Repository:
148+
3. Kubernetes `apt` Repository hinzufügen:
146149

147150
```shell
148-
echo "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
151+
echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.31/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
152+
sudo chmod 644 /etc/apt/sources.list.d/kubernetes.list # dies hilft tools wie command-not-found korrekt zu funktionieren
149153
```
150154

151155
4. Den `apt` Paketindex mit dem neuen Repository updaten und kubectl installieren:

0 commit comments

Comments
 (0)