Skip to content

Commit 465b4da

Browse files
authored
Merge pull request #29221 from PI-Victor/merged-main-dev-1.22
Last branch sync for dev-1.22
2 parents afeca10 + 61ac44b commit 465b4da

File tree

31 files changed

+417
-149
lines changed

31 files changed

+417
-149
lines changed

OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ aliases:
161161
- chenxuc
162162
- howieyuen
163163
- idealhack
164+
- mengjiao-liu
164165
- pigletfly
165166
- SataQiu
166167
- tanjunchen

README-uk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- # The Kubernetes documentation -->
22
# Документація Kubernetes
33

4-
[![Netlify Status](https://api.netlify.com/api/v1/badges/be93b718-a6df-402a-b4a4-855ba186c97d/deploy-status)](https://app.netlify.com/sites/kubernetes-io-master-staging/deploys) [![GitHub release](https://img.shields.io/github/release/kubernetes/website.svg)](https://github.com/kubernetes/website/releases/latest)
4+
[![Netlify Status](https://api.netlify.com/api/v1/badges/be93b718-a6df-402a-b4a4-855ba186c97d/deploy-status)](https://app.netlify.com/sites/kubernetes-io-main-staging/deploys) [![GitHub release](https://img.shields.io/github/release/kubernetes/website.svg)](https://github.com/kubernetes/website/releases/latest)
55

66
<!-- This repository contains the assets required to build the [Kubernetes website and documentation](https://kubernetes.io/). We're glad that you want to contribute! -->
77
Вітаємо! В цьому репозиторії міститься все необхідне для роботи над [сайтом і документацією Kubernetes](https://kubernetes.io/). Ми щасливі, що ви хочете зробити свій внесок!

README.md

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
This repository contains the assets required to build the [Kubernetes website and documentation](https://kubernetes.io/). We're glad that you want to contribute!
66

7-
+ [Contributing to the docs](#contributing-to-the-docs)
8-
+ [Localization ReadMes](#localization-readmemds)
7+
- [Contributing to the docs](#contributing-to-the-docs)
8+
- [Localization ReadMes](#localization-readmemds)
99

10-
# Using this repository
10+
## Using this repository
1111

1212
You can run the website locally using Hugo (Extended version), or you can run it in a container runtime. We strongly recommend using the container runtime, as it gives deployment consistency with the live website.
1313

@@ -22,14 +22,14 @@ To use this repository, you need the following installed locally:
2222

2323
Before you start, install the dependencies. Clone the repository and navigate to the directory:
2424

25-
```
25+
```bash
2626
git clone https://github.com/kubernetes/website.git
2727
cd website
2828
```
2929

3030
The Kubernetes website uses the [Docsy Hugo theme](https://github.com/google/docsy#readme). Even if you plan to run the website in a container, we strongly recommend pulling in the submodule and other development dependencies by running the following:
3131

32-
```
32+
```bash
3333
# pull in the Docsy submodule
3434
git submodule update --init --recursive --depth 1
3535
```
@@ -38,14 +38,14 @@ git submodule update --init --recursive --depth 1
3838

3939
To build the site in a container, run the following to build the container image and run it:
4040

41-
```
41+
```bash
4242
make container-image
4343
make container-serve
4444
```
4545

4646
If you see errors, it probably means that the hugo container did not have enough computing resources available. To solve it, increase the amount of allowed CPU and memory usage for Docker on your machine ([MacOSX](https://docs.docker.com/docker-for-mac/#resources) and [Windows](https://docs.docker.com/docker-for-windows/#resources)).
4747

48-
Open up your browser to http://localhost:1313 to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
48+
Open up your browser to <http://localhost:1313> to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
4949

5050
## Running the website locally using Hugo
5151

@@ -59,54 +59,55 @@ npm ci
5959
make serve
6060
```
6161

62-
This will start the local Hugo server on port 1313. Open up your browser to http://localhost:1313 to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
62+
This will start the local Hugo server on port 1313. Open up your browser to <http://localhost:1313> to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
6363

6464
## Building the API reference pages
6565

66-
The API reference pages located in `content/en/docs/reference/kubernetes-api` are built from the Swagger specification, using https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs.
66+
The API reference pages located in `content/en/docs/reference/kubernetes-api` are built from the Swagger specification, using <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>.
6767

6868
To update the reference pages for a new Kubernetes release (replace v1.20 in the following examples with the release to update to):
6969

7070
1. Pull the `kubernetes-resources-reference` submodule:
7171

72-
```
73-
git submodule update --init --recursive --depth 1
74-
```
72+
```bash
73+
git submodule update --init --recursive --depth 1
74+
```
7575

7676
2. Create a new API revision into the submodule, and add the Swagger specification:
7777

78-
```
79-
mkdir api-ref-generator/gen-resourcesdocs/api/v1.20
80-
curl 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/openapi-spec/swagger.json' > api-ref-generator/gen-resourcesdocs/api/v1.20/swagger.json
81-
```
78+
```bash
79+
mkdir api-ref-generator/gen-resourcesdocs/api/v1.20
80+
curl 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/openapi-spec/swagger.json' > api-ref-generator/gen-resourcesdocs/api/v1.20/swagger.json
81+
```
8282

8383
3. Copy the table of contents and fields configuration for the new release from a previous one:
8484

85-
```
86-
mkdir api-ref-generator/gen-resourcesdocs/api/v1.20
87-
cp api-ref-generator/gen-resourcesdocs/api/v1.19/* api-ref-generator/gen-resourcesdocs/api/v1.20/
88-
```
85+
```bash
86+
mkdir api-ref-generator/gen-resourcesdocs/api/v1.20
87+
cp api-ref-generator/gen-resourcesdocs/api/v1.19/* api-ref-generator/gen-resourcesdocs/api/v1.20/
88+
```
8989

9090
4. Adapt the files `toc.yaml` and `fields.yaml` to reflect the changes between the two releases
9191

9292
5. Next, build the pages:
9393

94-
```
95-
make api-reference
96-
```
94+
```bash
95+
make api-reference
96+
```
9797

98-
You can test the results locally by making and serving the site from a container image:
98+
You can test the results locally by making and serving the site from a container image:
9999

100-
```
101-
make container-image
102-
make container-serve
103-
```
100+
```bash
101+
make container-image
102+
make container-serve
103+
```
104104

105-
In a web browser, go to http://localhost:1313/docs/reference/kubernetes-api/ to view the API reference.
105+
In a web browser, go to <http://localhost:1313/docs/reference/kubernetes-api/> to view the API reference.
106106

107107
6. When all changes of the new contract are reflected into the configuration files `toc.yaml` and `fields.yaml`, create a Pull Request with the newly generated API reference pages.
108108

109109
## Troubleshooting
110+
110111
### 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
111112

112113
Hugo is shipped in two set of binaries for technical reasons. The current website runs based on the **Hugo Extended** version only. In the [release page](https://github.com/gohugoio/hugo/releases) look for archives with `extended` in the name. To confirm, run `hugo version` and look for the word `extended`.
@@ -115,7 +116,7 @@ Hugo is shipped in two set of binaries for technical reasons. The current websit
115116

116117
If you run `make serve` on macOS and receive the following error:
117118

118-
```
119+
```bash
119120
ERROR 2020/08/01 19:09:18 Error: listen tcp 127.0.0.1:1313: socket: too many open files
120121
make: *** [serve] Error 1
121122
```
@@ -124,7 +125,7 @@ Try checking the current limit for open files:
124125

125126
`launchctl limit maxfiles`
126127

127-
Then run the following commands (adapted from https://gist.github.com/tombigel/d503800a282fcadbee14b537735d202c):
128+
Then run the following commands (adapted from <https://gist.github.com/tombigel/d503800a282fcadbee14b537735d202c>):
128129

129130
```shell
130131
#!/bin/sh
@@ -147,8 +148,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
147148

148149
This works for Catalina as well as Mojave macOS.
149150

150-
151-
# Get involved with SIG Docs
151+
## Get involved with SIG Docs
152152

153153
Learn more about SIG Docs Kubernetes community and meetings on the [community page](https://github.com/kubernetes/community/tree/master/sig-docs#meetings).
154154

@@ -157,39 +157,39 @@ You can also reach the maintainers of this project at:
157157
- [Slack](https://kubernetes.slack.com/messages/sig-docs) [Get an invite for this Slack](https://slack.k8s.io/)
158158
- [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-docs)
159159

160-
# Contributing to the docs
160+
## Contributing to the docs
161161

162-
You can click the **Fork** button in the upper-right area of the screen to create a copy of this repository in your GitHub account. This copy is called a *fork*. Make any changes you want in your fork, and when you are ready to send those changes to us, go to your fork and create a new pull request to let us know about it.
162+
You can click the **Fork** button in the upper-right area of the screen to create a copy of this repository in your GitHub account. This copy is called a _fork_. Make any changes you want in your fork, and when you are ready to send those changes to us, go to your fork and create a new pull request to let us know about it.
163163

164-
Once your pull request is created, a Kubernetes reviewer will take responsibility for providing clear, actionable feedback. As the owner of the pull request, **it is your responsibility to modify your pull request to address the feedback that has been provided to you by the Kubernetes reviewer.**
164+
Once your pull request is created, a Kubernetes reviewer will take responsibility for providing clear, actionable feedback. As the owner of the pull request, **it is your responsibility to modify your pull request to address the feedback that has been provided to you by the Kubernetes reviewer.**
165165

166166
Also, note that you may end up having more than one Kubernetes reviewer provide you feedback or you may end up getting feedback from a Kubernetes reviewer that is different than the one initially assigned to provide you feedback.
167167

168-
Furthermore, in some cases, one of your reviewers might ask for a technical review from a Kubernetes tech reviewer when needed. Reviewers will do their best to provide feedback in a timely fashion but response time can vary based on circumstances.
168+
Furthermore, in some cases, one of your reviewers might ask for a technical review from a Kubernetes tech reviewer when needed. Reviewers will do their best to provide feedback in a timely fashion but response time can vary based on circumstances.
169169

170170
For more information about contributing to the Kubernetes documentation, see:
171171

172-
* [Contribute to Kubernetes docs](https://kubernetes.io/docs/contribute/)
173-
* [Page Content Types](https://kubernetes.io/docs/contribute/style/page-content-types/)
174-
* [Documentation Style Guide](https://kubernetes.io/docs/contribute/style/style-guide/)
175-
* [Localizing Kubernetes Documentation](https://kubernetes.io/docs/contribute/localization/)
172+
- [Contribute to Kubernetes docs](https://kubernetes.io/docs/contribute/)
173+
- [Page Content Types](https://kubernetes.io/docs/contribute/style/page-content-types/)
174+
- [Documentation Style Guide](https://kubernetes.io/docs/contribute/style/style-guide/)
175+
- [Localizing Kubernetes Documentation](https://kubernetes.io/docs/contribute/localization/)
176176

177-
# Localization `README.md`'s
177+
## Localization `README.md`'s
178178

179-
| Language | Language |
180-
|---|---|
181-
|[Chinese](README-zh.md)|[Korean](README-ko.md)|
182-
|[French](README-fr.md)|[Polish](README-pl.md)|
183-
|[German](README-de.md)|[Portuguese](README-pt.md)|
184-
|[Hindi](README-hi.md)|[Russian](README-ru.md)|
185-
|[Indonesian](README-id.md)|[Spanish](README-es.md)|
186-
|[Italian](README-it.md)|[Ukrainian](README-uk.md)|
187-
|[Japanese](README-ja.md)|[Vietnamese](README-vi.md)|
179+
| Language | Language |
180+
| -------------------------- | -------------------------- |
181+
| [Chinese](README-zh.md) | [Korean](README-ko.md) |
182+
| [French](README-fr.md) | [Polish](README-pl.md) |
183+
| [German](README-de.md) | [Portuguese](README-pt.md) |
184+
| [Hindi](README-hi.md) | [Russian](README-ru.md) |
185+
| [Indonesian](README-id.md) | [Spanish](README-es.md) |
186+
| [Italian](README-it.md) | [Ukrainian](README-uk.md) |
187+
| [Japanese](README-ja.md) | [Vietnamese](README-vi.md) |
188188

189-
# Code of conduct
189+
## Code of conduct
190190

191191
Participation in the Kubernetes community is governed by the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
192192

193-
# Thank you!
193+
## Thank you
194194

195195
Kubernetes thrives on community participation, and we appreciate your contributions to our website and our documentation!

0 commit comments

Comments
 (0)