Skip to content

Commit

Permalink
Merge pull request #48252 from rdalbuquerque/merged-main-dev-1.32
Browse files Browse the repository at this point in the history
Merge main branch into dev 1.32
  • Loading branch information
k8s-ci-robot authored Oct 8, 2024
2 parents e132a42 + ae1af38 commit d08241e
Show file tree
Hide file tree
Showing 72 changed files with 3,521 additions and 504 deletions.
14 changes: 6 additions & 8 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ aliases:
- salaxander
- sftim
- tengqm
- drewhagen # RT 1.31 temp acting Docs lead
sig-docs-localization-owners: # Admins for localization content
- a-mccarthy
- divya-mohan0209
Expand Down Expand Up @@ -64,8 +63,7 @@ aliases:
- salaxander
- sftim
- tengqm
- Princesso # RT 1.31 Docs Lead
- drewhagen # RT 1.31 temp acting Docs lead
- chanieljdan # RT 1.32 Docs Lead
sig-docs-en-reviews: # PR reviews for English content
- dipesh-rawat
- divya-mohan0209
Expand All @@ -81,8 +79,8 @@ aliases:
- shannonxtreme
- tengqm
- windsonsea
- Princesso # RT 1.31 Docs Lead
- drewhagen # RT 1.31 temp acting Docs lead
- Princesso
- drewhagen
sig-docs-es-owners: # Admins for Spanish content
- electrocucaracha
- krol3
Expand Down Expand Up @@ -228,12 +226,12 @@ aliases:
- MaxymVlasov
# authoritative source: git.k8s.io/community/OWNERS_ALIASES
committee-steering: # provide PR approvals for announcements
- bentheelder
- aojea
- BenTheElder
- justaugustus
- mrbobbytables
- pacoxu
- palnabarun
- pohly
- saschagrunert
- soltysh
# authoritative source: https://git.k8s.io/sig-release/OWNERS_ALIASES
sig-release-leads:
Expand Down
2 changes: 1 addition & 1 deletion README-ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist

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

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

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

Expand Down
5 changes: 5 additions & 0 deletions assets/scss/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,11 @@ section#cncf {
}
}

footer.row {
margin-left: initial;
margin-right: initial;
}

/* DOCUMENTATION */

// nav-tabs and tab-content
Expand Down
56 changes: 55 additions & 1 deletion assets/scss/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -266,16 +266,26 @@ body.td-404 main .error-details {

/* FOOTER */
footer {
background-color: #303030;
background-color: #202020;
/* darkened later in this file */
background-image: url("/images/texture.png");
padding: 1rem !important;
min-height: initial !important;
justify-content: center;

> div, > p {
max-width: 95%;
@media only screen and (min-width: 768px) {
max-width: calc(min(80rem,90vw)); // avoid spreading too wide
}
color: inherit;
background: transparent;

a:hover {
color: inherit;
background: transparent;
text-decoration: underline;
}
}

> .footer__links {
Expand Down Expand Up @@ -313,6 +323,50 @@ footer {
}
}

footer {
background-image: linear-gradient(rgba(0, 0, 0, 0.527),rgba(0, 0, 0, 0.5)) , url("/images/texture.png");
color: #e9e9e9;
}

// Custom footer sizing
@media (min-width: 800px) and (max-width: 1279px) {
footer {
ul.footer-icons {
min-width: 17.5vw;
display: flex;
flex-wrap: nowrap;
flex-direction: row;
justify-content: space-evenly;
}
.col-sm-2 {
flex: 0 0 22.5%;
max-width: 22.5%;
}
.footer-main.text-center {
flex: 0 0 50%;
max-width: 50%;
}

}
}


@media (max-width: 799px) {
footer ul.footer-icons {
display: flex;
flex-wrap: nowrap;
flex-direction: column;
align-items: flex-start;
row-gap: 0.5em;
}
footer div.order-1 ul.footer-icons {
margin-left: auto;
}
footer div.order-3 ul.footer-icons {
margin-right: auto;
}
}

/* SIDE-DRAWER MENU */

.pi-pushmenu .sled {
Expand Down
14 changes: 9 additions & 5 deletions content/de/docs/tasks/tools/install-kubectl-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Um kubectl auf Linux zu installieren, gibt es die folgenden Möglichkeiten:

```shell
sudo apt-get update
sudo apt-get install -y ca-certificates curl
sudo apt-get install -y ca-certificates curl gnupg
```

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

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

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

3. Kubernetes zum `apt` Repository:
3. Kubernetes `apt` Repository hinzufügen:

```shell
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
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
sudo chmod 644 /etc/apt/sources.list.d/kubernetes.list # dies hilft tools wie command-not-found korrekt zu funktionieren
```

4. Den `apt` Paketindex mit dem neuen Repository updaten und kubectl installieren:
Expand Down
Loading

0 comments on commit d08241e

Please sign in to comment.