Skip to content

Commit f61e010

Browse files
authored
Merge pull request #34966 from krol3/merged-main-dev-1.25
Sync main branch into dev-1.25
2 parents 40fd3b8 + bde5fe9 commit f61e010

File tree

271 files changed

+12601
-6088
lines changed

Some content is hidden

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

271 files changed

+12601
-6088
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CONTAINER_ENGINE ?= docker
99
IMAGE_REGISTRY ?= gcr.io/k8s-staging-sig-docs
1010
IMAGE_VERSION=$(shell scripts/hash-files.sh Dockerfile Makefile | cut -c 1-12)
1111
CONTAINER_IMAGE = $(IMAGE_REGISTRY)/k8s-website-hugo:v$(HUGO_VERSION)-$(IMAGE_VERSION)
12-
CONTAINER_RUN = $(CONTAINER_ENGINE) run --rm --interactive --tty --volume $(CURDIR):/src
12+
CONTAINER_RUN = "$(CONTAINER_ENGINE)" run --rm --interactive --tty --volume "$(CURDIR):/src"
1313

1414
CCRED=\033[0;31m
1515
CCEND=\033[0m
@@ -95,7 +95,7 @@ docker-internal-linkcheck:
9595

9696
container-internal-linkcheck: link-checker-image-pull
9797
$(CONTAINER_RUN) $(CONTAINER_IMAGE) hugo --config config.toml,linkcheck-config.toml --buildFuture --environment test
98-
$(CONTAINER_ENGINE) run --mount type=bind,source=$(CURDIR),target=/test --rm wjdp/htmltest htmltest
98+
$(CONTAINER_ENGINE) run --mount "type=bind,source=$(CURDIR),target=/test" --rm wjdp/htmltest htmltest
9999

100100
clean-api-reference: ## Clean all directories in API reference directory, preserve _index.md
101101
rm -rf content/en/docs/reference/kubernetes-api/*/

README-ko.md

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
이 저장소에는 [쿠버네티스 웹사이트 및 문서](https://kubernetes.io/)를 빌드하는 데 필요한 자산이 포함되어 있습니다. 기여해주셔서 감사합니다!
66

7+
- [문서에 기여하기](#contributing-to-the-docs)
8+
- [`README.md`에 대한 쿠버네티스 문서 현지화](#localization-readmemds)
9+
710
# 저장소 사용하기
811

912
Hugo(확장 버전)를 사용하여 웹사이트를 로컬에서 실행하거나, 컨테이너 런타임에서 실행할 수 있습니다. 라이브 웹사이트와의 배포 일관성을 제공하므로, 컨테이너 런타임을 사용하는 것을 적극 권장합니다.
@@ -40,6 +43,8 @@ make container-image
4043
make container-serve
4144
```
4245

46+
에러가 발생한다면, Hugo 컨테이너를 위한 컴퓨팅 리소스가 충분하지 않기 때문일 수 있습니다. 이를 해결하려면, 머신에서 도커에 허용할 CPU 및 메모리 사용량을 늘립니다([MacOSX](https://docs.docker.com/docker-for-mac/#resources) / [Windows](https://docs.docker.com/docker-for-windows/#resources)).
47+
4348
웹사이트를 보려면 브라우저를 http://localhost:1313 으로 엽니다. 소스 파일을 변경하면 Hugo가 웹사이트를 업데이트하고 브라우저를 강제로 새로 고칩니다.
4449

4550
## Hugo를 사용하여 로컬에서 웹사이트 실행하기
@@ -56,7 +61,45 @@ make serve
5661

5762
그러면 포트 1313에서 로컬 Hugo 서버가 시작됩니다. 웹사이트를 보려면 http://localhost:1313 으로 브라우저를 엽니다. 소스 파일을 변경하면, Hugo가 웹사이트를 업데이트하고 브라우저를 강제로 새로 고칩니다.
5863

64+
## API 레퍼런스 페이지 빌드하기
65+
66+
`content/en/docs/reference/kubernetes-api`에 있는 API 레퍼런스 페이지는 <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>를 사용하여 Swagger 명세로부터 빌드되었습니다.
67+
68+
새로운 쿠버네티스 릴리스를 위해 레퍼런스 페이지를 업데이트하려면 다음 단계를 수행합니다.
69+
70+
1. `api-ref-generator` 서브모듈을 받아옵니다.
71+
72+
```bash
73+
git submodule update --init --recursive --depth 1
74+
```
75+
76+
2. Swagger 명세를 업데이트합니다.
77+
78+
```bash
79+
curl 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/openapi-spec/swagger.json' > api-ref-assets/api/swagger.json
80+
```
81+
82+
3. `api-ref-assets/config/`에서, 새 릴리스의 변경 사항이 반영되도록 `toc.yaml``fields.yaml` 파일을 업데이트합니다.
83+
84+
4. 다음으로, 페이지를 빌드합니다.
85+
86+
```bash
87+
make api-reference
88+
```
89+
90+
로컬에서 결과를 테스트하기 위해 컨테이너 이미지를 이용하여 사이트를 빌드 및 실행합니다.
91+
92+
```bash
93+
make container-image
94+
make container-serve
95+
```
96+
97+
웹 브라우저에서, <http://localhost:1313/docs/reference/kubernetes-api/>로 이동하여 API 레퍼런스를 확인합니다.
98+
99+
5. 모든 API 변경사항이 `toc.yaml``fields.yaml` 구성 파일에 반영되었다면, 새로 생성된 API 레퍼런스 페이지에 대한 PR을 엽니다.
100+
59101
## 문제 해결
102+
60103
### error: failed to transform resource: TOCSS: failed to transform "scss/main.scss" (text/x-scss): this feature is not available in your current Hugo version
61104

62105
Hugo는 기술적인 이유로 2개의 바이너리 세트로 제공됩니다. 현재 웹사이트는 **Hugo 확장** 버전 기반에서만 실행됩니다. [릴리스 페이지](https://github.com/gohugoio/hugo/releases)에서 이름에 `extended` 가 포함된 아카이브를 찾습니다. 확인하려면, `hugo version` 을 실행하고 `extended` 라는 단어를 찾습니다.
@@ -97,17 +140,17 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
97140

98141
이 내용은 Catalina와 Mojave macOS에서 작동합니다.
99142

100-
101143
# SIG Docs에 참여하기
102144

103145
[커뮤니티 페이지](https://github.com/kubernetes/community/tree/master/sig-docs#meetings)에서 SIG Docs 쿠버네티스 커뮤니티 및 회의에 대한 자세한 내용을 확인합니다.
104146

105147
이 프로젝트의 메인테이너에게 연락을 할 수도 있습니다.
106148

107-
- [슬랙](https://kubernetes.slack.com/messages/sig-docs) [슬랙에 초대 받기](https://slack.k8s.io/)
149+
- [슬랙](https://kubernetes.slack.com/messages/sig-docs)
150+
- [슬랙에 초대 받기](https://slack.k8s.io/)
108151
- [메일링 리스트](https://groups.google.com/forum/#!forum/kubernetes-sig-docs)
109152

110-
# 문서에 기여하기
153+
# 문서에 기여하기 {#contributing-to-the-docs}
111154

112155
이 저장소에 대한 복제본을 여러분의 GitHub 계정에 생성하기 위해 화면 오른쪽 위 영역에 있는 **Fork** 버튼을 클릭하면 됩니다. 이 복제본은 *fork* 라고 부릅니다. 여러분의 fork에서 원하는 임의의 변경 사항을 만들고, 해당 변경 사항을 보낼 준비가 되었다면, 여러분의 fork로 이동하여 새로운 풀 리퀘스트를 만들어 우리에게 알려주시기 바랍니다.
113156

@@ -124,7 +167,15 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
124167
* [문서화 스타일 가이드](http://kubernetes.io/docs/contribute/style/style-guide/)
125168
* [쿠버네티스 문서 현지화](https://kubernetes.io/docs/contribute/localization/)
126169

127-
# `README.md`에 대한 쿠버네티스 문서 현지화(localization)
170+
### 신규 기여자 대사(ambassadors)
171+
172+
기여 과정에서 도움이 필요하다면, [신규 기여자 대사](https://kubernetes.io/docs/contribute/advanced/#serve-as-a-new-contributor-ambassador)에게 연락하는 것이 좋습니다. 이들은 신규 기여자를 멘토링하고 첫 PR 과정에서 도움을 주는 역할도 담당하는 SIG Docs 승인자입니다. 신규 기여자 대사에게 문의할 가장 좋은 곳은 [쿠버네티스 슬랙](https://slack.k8s.io/)입니다. 현재 SIG Docs 신규 기여자 대사는 다음과 같습니다.
173+
174+
| Name | Slack | GitHub |
175+
| -------------------------- | -------------------------- | -------------------------- |
176+
| Arsh Sharma | @arsh | @RinkiyaKeDad |
177+
178+
# `README.md`에 대한 쿠버네티스 문서 현지화(localization) {#localization-readmemds}
128179

129180
## 한국어
130181

@@ -135,6 +186,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
135186
* 손석호 ([GitHub - @seokho-son](https://github.com/seokho-son))
136187
* [슬랙 채널](https://kubernetes.slack.com/messages/kubernetes-docs-ko)
137188

189+
138190
# 행동 강령
139191

140192
쿠버네티스 커뮤니티 참여는 [CNCF 행동 강령](https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/ko.md)을 따릅니다.

README-zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ To build the site in a container, run the following to build the container image
8080
要在容器中构建网站,请通过以下命令来构建容器镜像并运行:
8181

8282
```bash
83-
make container-image
83+
# 你可以将 $CONTAINER_ENGINE 设置为任何 Docker 类容器工具的名称
8484
make container-serve
8585
```
8686

content/de/docs/concepts/overview/what-is-kubernetes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Dieses [Design](https://git.k8s.io/community/contributors/design-proposals/archi
6161
Kubernetes ist kein traditionelles, allumfassendes PaaS (Plattform als ein Service) System. Da Kubernetes nicht auf Hardware-,
6262
sondern auf Containerebene arbeitet, bietet es einige allgemein anwendbare Funktionen, die PaaS-Angeboten gemeinsam sind,
6363
wie Bereitstellung, Skalierung, Lastausgleich, Protokollierung und Überwachung.
64-
Kubernetes ist jedoch nicht monolithisch, und diese Standardlösungen sind optional und modular etweiterbar.
64+
Kubernetes ist jedoch nicht monolithisch, und diese Standardlösungen sind optional und modular erweiterbar.
6565
Kubernetes liefert die Bausteine für den Aufbau von Entwicklerplattformen, bewahrt aber die
6666
Wahlmöglichkeiten und Flexibilität der Benutzer, wo es wichtig ist.
6767

@@ -79,7 +79,7 @@ Kubernetes:
7979
Cluster-Speichersysteme (z.B. Ceph) als eingebaute Dienste. Solche Komponenten können
8080
auf Kubernetes laufen und/oder von Anwendungen, die auf Kubernetes laufen, über
8181
portable Mechanismen wie den Open Service Broker angesprochen werden.
82-
* Bietet keine Konfigurationssprache bzw. kein Konfigurationssystem (z.B.[jsonnet](https://github.com/google/jsonnet)).
82+
* Bietet keine Konfigurationssprache bzw. kein Konfigurationssystem (z.B. [jsonnet](https://github.com/google/jsonnet)).
8383
Es bietet eine deklarative API, die von beliebigen Formen deklarativer Spezifikationen angesprochen werden kann.
8484
* Bietet keine umfassenden Systeme zur Maschinenkonfiguration, Wartung, Verwaltung oder Selbstheilung.
8585

@@ -135,17 +135,17 @@ Zusammenfassung der Container-Vorteile:
135135
* **Dev und Ops Trennung der Bedenken**:
136136
Erstellen Sie Anwendungscontainer-Images nicht zum Deployment-, sondern zum Build-Releasezeitpunkt
137137
und entkoppeln Sie so Anwendungen von der Infrastruktur.
138-
* **Überwachbarkeit**
138+
* **Überwachbarkeit**:
139139
Nicht nur Informationen und Metriken auf Betriebssystemebene werden angezeigt,
140140
sondern auch der Zustand der Anwendung und andere Signale.
141141
* **Umgebungskontinuität in Entwicklung, Test und Produktion**:
142142
Läuft auf einem Laptop genauso wie in der Cloud.
143-
* **Cloud- und OS-Distribution portabilität**:
143+
* **Cloud- und OS-Distribution-Portabilität**:
144144
Läuft auf Ubuntu, RHEL, CoreOS, On-Prem, Google Kubernetes Engine und überall sonst.
145145
* **Anwendungsorientiertes Management**:
146146
Erhöht den Abstraktionsgrad vom Ausführen eines Betriebssystems auf virtueller Hardware
147147
bis zum Ausführen einer Anwendung auf einem Betriebssystem unter Verwendung logischer Ressourcen.
148-
* **Locker gekoppelte, verteilte, elastische, freie [micro-services](https://martinfowler.com/articles/microservices.html)**:
148+
* **Locker gekoppelte, verteilte, elastische, freie [Microservices](https://martinfowler.com/articles/microservices.html)**:
149149
Anwendungen werden in kleinere, unabhängige Teile zerlegt und können dynamisch bereitgestellt
150150
und verwaltet werden -- nicht ein monolithischer Stack, der auf einer großen Single-Purpose-Maschine läuft.
151151
* **Ressourcenisolierung**:

content/en/_index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ <h2>The Challenges of Migrating 150+ Microservices to Kubernetes</h2>
4343
<button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
4444
<br>
4545
<br>
46-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2022/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu22" button id="desktopKCButton">Attend KubeCon Europe on May 17-20, 2022</a>
46+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccncna22" button id="desktopKCButton">Attend KubeCon North America on October 24-28, 2022</a>
4747
<br>
4848
<br>
4949
<br>
5050
<br>
51-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccncna22" button id="desktopKCButton">Attend KubeCon North America on October 24-28, 2022</a>
51+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2023/?utm_source=kubernetes.io&utm_medium=nav&utm_campaign=kccnceu23" button id="desktopKCButton">Attend KubeCon Europe on April 17-21, 2023</a>
5252
</div>
5353
<div id="videoPlayer">
5454
<iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>

content/en/blog/_posts/2022-01-10-meet-our-contributors-APAC-India-region-01.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
layout: blog
33
title: "Meet Our Contributors - APAC (India region)"
4-
date: 2022-01-10T12:00:00+0000
4+
date: 2022-01-10
55
slug: meet-our-contributors-india-ep-01
6-
canonicalUrl: https://kubernetes.dev/blog/2022/01/10/meet-our-contributors-india-ep-01/
6+
canonicalUrl: https://www.kubernetes.dev/blog/2022/01/10/meet-our-contributors-india-ep-01/
77
---
88

99
**Authors & Interviewers:** [Anubhav Vardhan](https://github.com/anubha-v-ardhan), [Atharva Shinde](https://github.com/Atharva-Shinde), [Avinesh Tripathi](https://github.com/AvineshTripathi), [Debabrata Panigrahi](https://github.com/Debanitrkl), [Kunal Verma](https://github.com/verma-kunal), [Pranshu Srivastava](https://github.com/PranshuSrivastava), [Pritish Samal](https://github.com/CIPHERTron), [Purneswar Prasad](https://github.com/PurneswarPrasad), [Vedant Kakde](https://github.com/vedant-kakde)
@@ -19,7 +19,7 @@ Welcome to the first episode of the APAC edition of the "Meet Our Contributors"
1919

2020
In this post, we'll introduce you to five amazing folks from the India region who have been actively contributing to the upstream Kubernetes projects in a variety of ways, as well as being the leaders or maintainers of numerous community initiatives.
2121

22-
💫 *Let's get started, so without further ado…*
22+
💫 *Let's get started, so without further ado…*
2323

2424

2525
## [Arsh Sharma](https://github.com/RinkiyaKeDad)
@@ -39,7 +39,7 @@ To the newcomers, Arsh helps plan their early contributions sustainably.
3939

4040
Kunal Kushwaha is a core member of the Kubernetes marketing council. He is also a CNCF ambassador and one of the founders of the [CNCF Students Program](https://community.cncf.io/cloud-native-students/).. He also served as a Communications role shadow during the 1.22 release cycle.
4141

42-
At the end of his first year, Kunal began contributing to the [fabric8io kubernetes-client](https://github.com/fabric8io/kubernetes-client) project. He was then selected to work on the same project as part of Google Summer of Code. Kunal mentored people on the same project, first through Google Summer of Code then through Google Code-in.
42+
At the end of his first year, Kunal began contributing to the [fabric8io kubernetes-client](https://github.com/fabric8io/kubernetes-client) project. He was then selected to work on the same project as part of Google Summer of Code. Kunal mentored people on the same project, first through Google Summer of Code then through Google Code-in.
4343

4444
As an open-source enthusiast, he believes that diverse participation in the community is beneficial since it introduces new perspectives and opinions and respect for one's peers. He has worked on various open-source projects, and his participation in communities has considerably assisted his development as a developer.
4545

@@ -103,4 +103,3 @@ If you have any recommendations/suggestions for who we should interview next, pl
103103

104104

105105
We'll see you all in the next one. Everyone, till then, have a happy contributing! 👋
106-

content/en/blog/_posts/2022-03-15-meet-our-contributors-APAC-AU-NZ-region-01.md renamed to content/en/blog/_posts/2022-03-15-meet-our-contributors-APAC-AU-NZ-region-02.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: blog
33
title: "Meet Our Contributors - APAC (Aus-NZ region)"
4-
date: 2022-03-16T12:00:00+0000
4+
date: 2022-03-16
55
slug: meet-our-contributors-au-nz-ep-02
66
canonicalUrl: https://www.kubernetes.dev/blog/2022/03/14/meet-our-contributors-au-nz-ep-02/
77
---
@@ -60,19 +60,13 @@ Nick Young works at VMware as a technical lead for Contour, a CNCF ingress contr
6060

6161
His contribution path was notable in that he began working on major areas of the Kubernetes project early on, skewing his trajectory.
6262

63-
He asserts the best thing a new contributor can do is to "start contributing". Naturally, if it is relevant to their employment, that is excellent; however, investing non-work time in contributing can pay off in the long run in terms of work. He believes that new contributors, particularly those who are currently Kubernetes users, should be encouraged to participate in higher-level project discussions.
63+
He asserts the best thing a new contributor can do is to "start contributing". Naturally, if it is relevant to their employment, that is excellent; however, investing non-work time in contributing can pay off in the long run in terms of work. He believes that new contributors, particularly those who are currently Kubernetes users, should be encouraged to participate in higher-level project discussions.
6464

6565
> _Just being active and contributing will get you a long way. Once you've been active for a while, you'll find that you're able to answer questions, which will mean you're asked questions, and before you know it you are an expert._
6666
67-
68-
69-
7067
---
7168

7269
If you have any recommendations/suggestions for who we should interview next, please let us know in #sig-contribex. Your suggestions would be much appreciated. We're thrilled to have additional folks assisting us in reaching out to even more wonderful individuals of the community.
7370

7471

7572
We'll see you all in the next one. Everyone, till then, have a happy contributing! 👋
76-
77-
78-

content/en/docs/concepts/architecture/control-plane-node-communication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ are allowed.
3333
Nodes should be provisioned with the public root certificate for the cluster such that they can
3434
connect securely to the API server along with valid client credentials. A good approach is that the
3535
client credentials provided to the kubelet are in the form of a client certificate. See
36-
[kubelet TLS bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/)
36+
[kubelet TLS bootstrapping](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/)
3737
for automated provisioning of kubelet client certificates.
3838

3939
Pods that wish to connect to the API server can do so securely by leveraging a service account so

0 commit comments

Comments
 (0)