Skip to content

Commit 8e5e4bc

Browse files
Merge branch 'main' into patch-1
2 parents 0066c6b + 04b135a commit 8e5e4bc

File tree

807 files changed

+85221
-37122
lines changed

Some content is hidden

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

807 files changed

+85221
-37122
lines changed

OWNERS_ALIASES

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ aliases:
1818
- onlydole
1919
- reylejano
2020
- sftim
21+
- seokho-son
2122
- tengqm
2223
sig-docs-de-owners: # Admins for German content
2324
- bene2k1
@@ -36,11 +37,11 @@ aliases:
3637
- nate-double-u
3738
- onlydole
3839
- reylejano
39-
- Rishit-dagli # 1.28 Release Team Docs Lead
4040
- sftim
4141
- tengqm
4242
sig-docs-en-reviews: # PR reviews for English content
4343
- bradtopol
44+
- dipesh-rawat
4445
- divya-mohan0209
4546
- kbhawkey
4647
- mehabhalodiya
@@ -84,8 +85,6 @@ aliases:
8485
- Babapool
8586
- bishal7679
8687
- divya-mohan0209
87-
- Garima-Negi
88-
- verma-kunal
8988
sig-docs-id-owners: # Admins for Indonesian content
9089
- ariscahyadi
9190
- danninov
@@ -147,6 +146,7 @@ aliases:
147146
- tengqm
148147
- windsonsea
149148
- xichengliudui
149+
- ydFu
150150
sig-docs-zh-reviews: # PR reviews for Chinese content
151151
- asa3311
152152
- chenrui333
@@ -238,3 +238,17 @@ aliases:
238238
- jimangel # Release Manager Associate
239239
- jrsapi # Release Manager Associate
240240
- salaxander # Release Manager Associate
241+
# authoritative source: https://github.com/kubernetes/committee-security-response/blob/main/OWNERS_ALIASES
242+
committee-security-response:
243+
- cjcullen
244+
- cji
245+
- enj
246+
- joelsmith
247+
- micahhausler
248+
- ritazh
249+
- SaranBalaji90
250+
- tabbysable
251+
# authoritative source: https://github.com/kubernetes/sig-security/blob/main/OWNERS_ALIASES
252+
sig-security-leads:
253+
- IanColdwater
254+
- tabbysable

README-hi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
[![Build Status](https://api.travis-ci.org/kubernetes/website.svg?branch=master)](https://travis-ci.org/kubernetes/website)
44
[![GitHub release](https://img.shields.io/github/release/kubernetes/website.svg)](https://github.com/kubernetes/website/releases/latest)
55

6-
स्वागत हे! इस रिपॉजिटरी में [कुबरनेट्स वेबसाइट और दस्तावेज](https://kubernetes.io/) बनाने के लिए आवश्यक सभी संपत्तियां हैं। हम बहुत खुश हैं कि आप योगदान करना चाहते हैं!
6+
स्वागत है! इस रिपॉजिटरी में [कुबरनेट्स वेबसाइट और दस्तावेज़](https://kubernetes.io/) बनाने के लिए आवश्यक सभी संपत्तियां हैं। हम बहुत खुश हैं कि आप योगदान करना चाहते हैं!
77

88
## डॉक्स में योगदान देना
99

10-
आप अपने GitHub खाते में इस रिपॉजिटरी की एक copy बनाने के लिए स्क्रीन के ऊपरी-दाएँ क्षेत्र में **Fork** बटन पर क्लिक करें। इस copy को *Fork* कहा जाता है। अपने fork में परिवर्तन करने के बाद जब आप उनको हमारे पास भेजने के लिए तैयार हों, तो अपने fork पर जाएं और हमें इसके बारे में बताने के लिए एक नया pull request बनाएं।
10+
आप अपने GitHub खाते में इस रिपॉजिटरी की एक copy बनाने के लिए स्क्रीन के ऊपरी-दाएँ क्षेत्र में **Fork** बटन पर क्लिक करें। इस copy को *Fork* कहा जाता है। अपने fork में परिवर्तन करने के बाद जब आप उनको हमारे पास भेजने के लिए तैयार हों, तो अपने fork पर जाएँ और हमें इसके बारे में बताने के लिए एक नया pull request बनाएं।
1111

1212
एक बार जब आपका pull request बन जाता है, तो एक कुबरनेट्स समीक्षक स्पष्ट, कार्रवाई योग्य प्रतिक्रिया प्रदान करने की जिम्मेदारी लेगा। pull request के मालिक के रूप में, **यह आपकी जिम्मेदारी है कि आप कुबरनेट्स समीक्षक द्वारा प्रदान की गई प्रतिक्रिया को संबोधित करने के लिए अपने pull request को संशोधित करें।**
1313

README-vi.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Tài liệu Kubernetes
22

3-
[![Build Status](https://api.travis-ci.org/kubernetes/website.svg?branch=master)](https://travis-ci.org/kubernetes/website)
4-
[![GitHub release](https://img.shields.io/github/release/kubernetes/website.svg)](https://github.com/kubernetes/website/releases/latest)
3+
[![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)
54

65
Chào mừng! Kho lưu trữ này chứa tất cả các tài nguyên cần thiết để xây dựng [trang web của Kubernetes và các tài liệu](https://kubernetes.io/). Chúng tôi rất vui vì bạn muốn đóng góp.
76

README-zh.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ Open up your browser to <http://localhost:1313> to view the website. As you make
120120
<!--
121121
## Running the website locally using Hugo
122122
123-
Make sure to install the Hugo extended version specified by the `HUGO_VERSION` environment variable in the [`netlify.toml`](netlify.toml#L10) file.
123+
Make sure to install the Hugo extended version specified by the `HUGO_VERSION` environment variable in the [`netlify.toml`](netlify.toml#L11) file.
124124
125125
To build and test the site locally, run:
126126
-->
127127
## 在本地使用 Hugo 来运行网站
128128

129-
请确保安装的是 [`netlify.toml`](netlify.toml#L10) 文件中环境变量 `HUGO_VERSION` 所指定的
129+
请确保安装的是 [`netlify.toml`](netlify.toml#L11) 文件中环境变量 `HUGO_VERSION` 所指定的
130130
Hugo Extended 版本。
131131

132132
若要在本地构造和测试网站,请运行:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Open up your browser to <http://localhost:1313> to view the website. As you make
5656

5757
## Running the website locally using Hugo
5858

59-
Make sure to install the Hugo extended version specified by the `HUGO_VERSION` environment variable in the [`netlify.toml`](netlify.toml#L10) file.
59+
Make sure to install the Hugo extended version specified by the `HUGO_VERSION` environment variable in the [`netlify.toml`](netlify.toml#L11) file.
6060

6161
To build and test the site locally, run:
6262

api-ref-assets/api/swagger.json

Lines changed: 7820 additions & 23666 deletions
Large diffs are not rendered by default.

api-ref-assets/config/fields.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
- fields:
8989
- nominatedNodeName
9090
- hostIP
91+
- hostIPs
9192
- startTime
9293
- phase
9394
- message
@@ -99,6 +100,7 @@
99100
- initContainerStatuses
100101
- containerStatuses
101102
- ephemeralContainerStatuses
103+
- resourceClaimStatuses
102104
- resize
103105

104106
- definition: io.k8s.api.core.v1.Container
@@ -137,6 +139,7 @@
137139
- livenessProbe
138140
- readinessProbe
139141
- startupProbe
142+
- restartPolicy
140143
- name: Security Context
141144
fields:
142145
- securityContext
@@ -228,6 +231,7 @@
228231
fields:
229232
- terminationMessagePath
230233
- terminationMessagePolicy
234+
- restartPolicy
231235
- name: Debugging
232236
fields:
233237
- stdin
@@ -393,9 +397,14 @@
393397
fields:
394398
- selector
395399
- manualSelector
396-
- name: Alpha level
400+
- name: Beta level
397401
fields:
398402
- podFailurePolicy
403+
- name: Alpha level
404+
fields:
405+
- backoffLimitPerIndex
406+
- maxFailedIndexes
407+
- podReplacementPolicy
399408

400409
- definition: io.k8s.api.batch.v1.JobStatus
401410
field_categories:
@@ -411,6 +420,10 @@
411420
- name: Beta level
412421
fields:
413422
- ready
423+
- name: Alpha level
424+
fields:
425+
- failedIndexes
426+
- terminating
414427

415428
- definition: io.k8s.api.batch.v1.CronJobSpec
416429
field_categories:

api-ref-assets/config/toc.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ parts:
153153
version: v1alpha1
154154
- name: SelfSubjectReview
155155
group: authentication.k8s.io
156-
version: v1beta1
156+
version: v1
157157
- name: Authorization Resources
158158
chapters:
159159
- name: LocalSubjectAccessReview
@@ -168,9 +168,6 @@ parts:
168168
- name: SubjectAccessReview
169169
group: authorization.k8s.io
170170
version: v1
171-
- name: SelfSubjectReview
172-
group: authentication.k8s.io
173-
version: v1alpha1
174171
- name: ClusterRole
175172
group: rbac.authorization.k8s.io
176173
version: v1
@@ -218,7 +215,7 @@ parts:
218215
version: v1
219216
- name: ValidatingAdmissionPolicy
220217
group: admissionregistration.k8s.io
221-
version: v1alpha1
218+
version: v1beta1
222219
otherDefinitions:
223220
- ValidatingAdmissionPolicyList
224221
- ValidatingAdmissionPolicyBinding

assets/scss/_base.scss

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -673,18 +673,19 @@ section#cncf {
673673
width: 100%;
674674
overflow: hidden;
675675
clear: both;
676+
display: flex;
677+
justify-content: space-evenly;
678+
flex-wrap: wrap;
676679

677680
h4 {
678681
line-height: normal;
679682
margin-bottom: 15px;
680683
}
681684

682-
& > div:first-child {
683-
float: left;
684-
}
685-
686-
& > div:last-child {
687-
float: right;
685+
& > div {
686+
background-color: #daeaf9;
687+
border-radius: 20px;
688+
padding: 25px;
688689
}
689690
}
690691

assets/scss/_custom.scss

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,48 @@ main {
354354
word-break: break-word;
355355
}
356356

357+
/* SCSS Related to the Metrics Table */
358+
359+
@media (max-width: 767px) { // for mobile devices, Display the names, Stability levels & types
360+
361+
table.metrics {
362+
th:nth-child(n + 4),
363+
td:nth-child(n + 4) {
364+
display: none;
365+
}
366+
367+
td.metric_type{
368+
min-width: 7em;
369+
}
370+
td.metric_stability_level{
371+
min-width: 6em;
372+
}
373+
}
374+
}
375+
376+
table.metrics tbody{ // Tested dimensions to improve overall aesthetic of the table
377+
tr {
378+
td {
379+
font-size: smaller;
380+
}
381+
td.metric_labels_varying{
382+
min-width: 9em;
383+
}
384+
td.metric_type{
385+
min-width: 9em;
386+
}
387+
td.metric_description{
388+
min-width: 10em;
389+
}
390+
391+
}
392+
}
393+
357394
table.no-word-break td,
358395
table.no-word-break code {
359396
word-break: normal;
360-
}
361397
}
362-
398+
}
363399

364400
// blockquotes and callouts
365401

0 commit comments

Comments
 (0)