Skip to content

Commit b0f6dbe

Browse files
Merge branch 'master' into patch-1
2 parents 45b4e5a + 32cf18e commit b0f6dbe

File tree

1,572 files changed

+85116
-99280
lines changed

Some content is hidden

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

1,572 files changed

+85116
-99280
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ charset = utf-8
55
max_line_length = 80
66
trim_trailing_whitespace = true
77

8+
[*.md]
9+
trim_trailing_whitespace = false
10+
811
[*.{css,html,js,json,sass,md,mmark,toml,yaml}]
912
indent_style = space
1013
indent_size = 2

.github/ISSUE_TEMPLATE/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Support Request
33
about: Support request or question relating to Kubernetes Website project
44
labels:
5-
- triage/support
5+
- kind/support
66
---
77
**This is Support**
88

.github/OWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# See the OWNERS docs at https://go.k8s.io/owners
2+
3+
reviewers:
4+
- sig-docs-en-reviews # Defined in OWNERS_ALIASES
5+
6+
approvers:
7+
- sig-docs-en-owners # Defined in OWNERS_ALIASES

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
Use the default base branch, “master”, if you're documenting existing
1515
features in the English localization.
1616
17-
If you're working on a different localization (not English), or you
18-
are documenting a feature that will be part of a future release, see
17+
If you're working on a different localization (not English), see
1918
https://kubernetes.io/docs/contribute/new-content/overview/#choose-which-git-branch-to-use
2019
for advice.
2120
21+
If you're documenting a feature that will be part of a future release, see
22+
https://kubernetes.io/docs/contribute/new-content/new-features/ for advice.
23+
2224
-->

.github/workflows/OWNERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# See the OWNERS docs at https://go.k8s.io/owners
2+
3+
# When modifying this file, consider the security implications of
4+
# allowing listed reviewers / approvals to modify or remove any
5+
# configured GitHub Actions.
6+
7+
reviewers:
8+
- sig-docs-leads
9+
10+
approvers:
11+
- sig-docs-leads

CONTRIBUTING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The [Kubernetes SIG Docs Discussion Group](https://groups.google.com/forum/#!for
1818

1919
### Style Guides and Templates
2020

21-
Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/home/contribute/page-templates/).
21+
Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](https://kubernetes.io/docs/contribute/style/page-content-types/).
2222

2323

2424
## Contributing to Documentation
@@ -35,3 +35,5 @@ Note that code issues should be filed against the main kubernetes repository, wh
3535
### Submitting Documentation Pull Requests
3636

3737
If you're fixing an issue in the existing documentation, you should submit a PR against the master branch. Follow [these instructions to create a documentation pull request against the kubernetes.io repository](http://kubernetes.io/docs/home/contribute/create-pull-request/).
38+
39+
For more information, see [contributing to Kubernetes docs](https://kubernetes.io/docs/contribute/).

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN apk add --no-cache \
1616
build-base \
1717
libc6-compat \
1818
npm && \
19-
npm install -G autoprefixer postcss-cli
19+
npm install -D autoprefixer postcss-cli
2020

2121
ARG HUGO_VERSION
2222

@@ -29,4 +29,6 @@ RUN mkdir -p /usr/local/src && \
2929

3030
WORKDIR /src
3131

32+
USER hugo:hugo
33+
3234
EXPOSE 1313

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ container-image:
6565
--build-arg HUGO_VERSION=$(HUGO_VERSION)
6666

6767
container-build: module-check
68-
$(CONTAINER_RUN) $(CONTAINER_IMAGE) hugo --minify
68+
$(CONTAINER_RUN) --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 $(CONTAINER_IMAGE) sh -c "npm ci && hugo --minify"
6969

7070
container-serve: module-check
71-
$(CONTAINER_RUN) --mount type=tmpfs,destination=/src/resources,tmpfs-mode=0755 -p 1313:1313 $(CONTAINER_IMAGE) hugo server --buildFuture --bind 0.0.0.0
71+
$(CONTAINER_RUN) --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 -p 1313:1313 $(CONTAINER_IMAGE) hugo server --buildFuture --bind 0.0.0.0 --destination /tmp/hugo --cleanDestinationDir
7272

7373
test-examples:
7474
scripts/test_examples.sh install

OWNERS

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ approvers:
77
- sig-docs-en-owners # Defined in OWNERS_ALIASES
88

99
emeritus_approvers:
10-
# chenopis, you're welcome to return when you're ready to resume PR wrangling
11-
# jaredbhatti, you're welcome to return when you're ready to resume PR wrangling
12-
# stewart-yu, you're welcome to return when you're ready to resume PR wrangling
10+
# - chenopis, commented out to disable PR assignments
11+
# - jaredbhatti, commented out to disable PR assignments
12+
# - steveperry-53, commented out to disable PR assignments
1313
- stewart-yu
14+
- zacharysarah
1415

1516
labels:
1617
- sig/docs

OWNERS_ALIASES

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ aliases:
2222
- mkorbi
2323
- rlenferink
2424
sig-docs-en-owners: # Admins for English content
25+
- annajung
2526
- bradtopol
2627
- celestehorgan
28+
- irvifa
2729
- jimangel
2830
- kbarnard10
2931
- kbhawkey
30-
- makoscafee
3132
- onlydole
3233
- savitharaghunathan
3334
- sftim
3435
- steveperry-53
3536
- tengqm
36-
- xiangpengzhao
3737
- zacharysarah
3838
- zparnold
3939
sig-docs-en-reviews: # PR reviews for English content
@@ -43,14 +43,11 @@ aliases:
4343
- jimangel
4444
- kbarnard10
4545
- kbhawkey
46-
- makoscafee
4746
- onlydole
4847
- rajeshdeshpande02
4948
- sftim
5049
- steveperry-53
5150
- tengqm
52-
- xiangpengzhao
53-
- zacharysarah
5451
- zparnold
5552
sig-docs-es-owners: # Admins for Spanish content
5653
- raelga
@@ -123,17 +120,17 @@ aliases:
123120
- bells17
124121
# cstoku
125122
- inductor
123+
- kakts
126124
- makocchi-git
127125
# MasayaAoyama
128126
- nasa9084
129-
- oke-py
127+
# oke-py
130128
sig-docs-ko-owners: # Admins for Korean content
131129
- ClaudiaJKang
132130
- gochist
133131
- ianychoi
134132
- seokho-son
135133
- ysyukr
136-
- zacharysarah
137134
sig-docs-ko-reviews: # PR reviews for Korean content
138135
- ClaudiaJKang
139136
- gochist
@@ -142,35 +139,34 @@ aliases:
142139
- ysyukr
143140
- pjhwa
144141
sig-docs-leads: # Website chairs and tech leads
142+
- irvifa
145143
- jimangel
146144
- kbarnard10
147145
- kbhawkey
148146
- onlydole
149147
- sftim
150-
- zacharysarah
151148
sig-docs-zh-owners: # Admins for Chinese content
152-
- chenopis
149+
# chenopis
153150
- chenrui333
154-
- dchen1107
155-
- haibinxie
156-
- hanjiayao
157-
- lichuqiang
151+
# dchen1107
152+
# haibinxie
153+
# hanjiayao
154+
# lichuqiang
158155
- SataQiu
156+
- tanjunchen
159157
- tengqm
160-
- xiangpengzhao
161158
- xichengliudui
162-
- zacharysarah
163-
- zhangxiaoyu-zidif
159+
# zhangxiaoyu-zidif
164160
sig-docs-zh-reviews: # PR reviews for Chinese content
165161
- chenrui333
162+
- howieyuen
166163
- idealhack
164+
- pigletfly
167165
- SataQiu
168166
- tanjunchen
169167
- tengqm
170-
- xiangpengzhao
171168
- xichengliudui
172-
- zhangxiaoyu-zidif
173-
- pigletfly
169+
# zhangxiaoyu-zidif
174170
sig-docs-pt-owners: # Admins for Portuguese content
175171
- femrtnz
176172
- jcjesus

0 commit comments

Comments
 (0)