Skip to content

Commit 3a7fab6

Browse files
authored
Merge pull request #39630 from reylejano/merged-main-dev-1.27
Merged main into dev-1.27 branch
2 parents aabfcc6 + 23db46b commit 3a7fab6

File tree

884 files changed

+35816
-16727
lines changed

Some content is hidden

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

884 files changed

+35816
-16727
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- ℹ️
1+
<!--
22
33
Hello!
44

OWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ emeritus_approvers:
1111
# - chenopis, commented out to disable PR assignments
1212
# - irvifa, commented out to disable PR assignments
1313
# - jaredbhatti, commented out to disable PR assignments
14+
# - jimangel, commented out to disable PR assignments
1415
# - kbarnard10, commented out to disable PR assignments
1516
# - steveperry-53, commented out to disable PR assignments
1617
- stewart-yu

OWNERS_ALIASES

Lines changed: 16 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ aliases:
3131
- annajung
3232
- bradtopol
3333
- divya-mohan0209
34-
- jimangel
3534
- kbhawkey
3635
- krol3
3736
- natalisucks
@@ -43,9 +42,9 @@ aliases:
4342
sig-docs-en-reviews: # PR reviews for English content
4443
- bradtopol
4544
- divya-mohan0209
46-
- jimangel
4745
- kbhawkey
4846
- mehabhalodiya
47+
- mengjiao-liu
4948
- natalisucks
5049
- nate-double-u
5150
- onlydole
@@ -54,45 +53,30 @@ aliases:
5453
- shannonxtreme
5554
- tengqm
5655
sig-docs-es-owners: # Admins for Spanish content
57-
- raelga
5856
- electrocucaracha
59-
sig-docs-es-reviews: # PR reviews for Spanish content
6057
- raelga
58+
sig-docs-es-reviews: # PR reviews for Spanish content
6159
- electrocucaracha
60+
- raelga
6261
sig-docs-fr-owners: # Admins for French content
63-
- remyleone
64-
- perriea
65-
- rekcah78
66-
- yastij
67-
- smana
68-
- rbenzair
69-
- abuisine
70-
- erickhun
71-
- jygastaud
7262
- awkif
73-
- oussemos
74-
- anthonydahanne
7563
- feloy
76-
sig-docs-fr-reviews: # PR reviews for French content
77-
- remyleone
7864
- perriea
7965
- rekcah78
80-
- yastij
81-
- smana
82-
- rbenzair
83-
- abuisine
84-
- erickhun
85-
- jygastaud
66+
- remyleone
67+
sig-docs-fr-reviews: # PR reviews for French content
8668
- awkif
87-
- oussemos
88-
- anthonydahanne
8969
- feloy
70+
- perriea
71+
- rekcah78
72+
- remyleone
9073
sig-docs-hi-owners: # Admins for Hindi content
9174
- anubha-v-ardhan
9275
- divya-mohan0209
9376
sig-docs-hi-reviews: # PR reviews for Hindi content
9477
- anubha-v-ardhan
9578
- Babapool
79+
- bishal7679
9680
- divya-mohan0209
9781
- Garima-Negi
9882
- verma-kunal
@@ -101,56 +85,45 @@ aliases:
10185
- danninov
10286
- girikuncoro
10387
- habibrosyad
104-
- phanama
105-
- wahyuoi
10688
sig-docs-id-reviews: # PR reviews for Indonesian content
10789
- ariscahyadi
10890
- danninov
10991
- girikuncoro
11092
- habibrosyad
111-
- phanama
112-
- wahyuoi
11393
sig-docs-it-owners: # Admins for Italian content
11494
- fabriziopandini
11595
- Fale
11696
- mattiaperi
117-
- micheleberardi
11897
sig-docs-it-reviews: # PR reviews for Italian content
11998
- fabriziopandini
12099
- Fale
121100
- mattiaperi
122-
- micheleberardi
123101
sig-docs-ja-owners: # Admins for Japanese content
124102
- inductor
125103
- nasa9084
126104
sig-docs-ja-reviews: # PR reviews for Japanese content
127105
- atoato88
128106
- bells17
129107
- kakts
130-
- makocchi-git
131108
- ptux
132109
- t-inu
133110
sig-docs-ko-owners: # Admins for Korean content
134-
- ClaudiaJKang
135111
- gochist
136112
- ianychoi
137113
- jihoon-seo
138114
- seokho-son
139115
- yoonian
140116
- ysyukr
141117
sig-docs-ko-reviews: # PR reviews for Korean content
142-
- ClaudiaJKang
143118
- gochist
144119
- ianychoi
145120
- jihoon-seo
146121
- jmyung
147-
- pjhwa
148122
- seokho-son
149123
- yoonian
150124
- ysyukr
151125
sig-docs-leads: # Website chairs and tech leads
152126
- divya-mohan0209
153-
- jimangel
154127
- kbhawkey
155128
- natalisucks
156129
- onlydole
@@ -171,7 +144,9 @@ aliases:
171144
- chenxuc
172145
- howieyuen
173146
# idealhack
147+
- kinzhi
174148
- mengjiao-liu
149+
- my-git9
175150
# pigletfly
176151
- SataQiu
177152
- Sea-n
@@ -181,62 +156,46 @@ aliases:
181156
- xichengliudui
182157
- ydFu
183158
sig-docs-pt-owners: # Admins for Portuguese content
159+
- devlware
184160
- edsoncelio
185161
- femrtnz
186-
- jailton
187162
- jcjesus
188-
- devlware
189-
- jhonmike
190163
- rikatz
191164
- stormqueen1990
192165
- yagonobre
193166
sig-docs-pt-reviews: # PR reviews for Portugese content
167+
- devlware
194168
- edsoncelio
195169
- femrtnz
196-
- jailton
197170
- jcjesus
198-
- devlware
199-
- jhonmike
171+
- mrerlison
200172
- rikatz
201173
- stormqueen1990
202174
- yagonobre
203175
sig-docs-vi-owners: # Admins for Vietnamese content
204176
- huynguyennovem
205-
- ngtuna
206177
- truongnh1992
207178
sig-docs-vi-reviews: # PR reviews for Vietnamese content
208179
- huynguyennovem
209-
- ngtuna
210180
- truongnh1992
211181
sig-docs-ru-owners: # Admins for Russian content
212182
- Arhell
213-
- msheldyakov
214-
- aisonaku
215-
- potapy4
216-
- dianaabv
217183
- shurup
218184
sig-docs-ru-reviews: # PR reviews for Russian content
219185
- Arhell
220-
- msheldyakov
221-
- aisonaku
222-
- potapy4
223-
- dianaabv
224186
- shurup
225187
sig-docs-pl-owners: # Admins for Polish content
226188
- mfilocha
227189
- nvtkaszpir
228190
sig-docs-pl-reviews: # PR reviews for Polish content
191+
- kpucynski
229192
- mfilocha
230193
- nvtkaszpir
231-
- kpucynski
232194
sig-docs-uk-owners: # Admins for Ukrainian content
233-
- anastyakulyk
234-
- butuzov
195+
- Arhell
235196
- MaxymVlasov
236197
sig-docs-uk-reviews: # PR reviews for Ukrainian content
237-
- anastyakulyk
238198
- Arhell
239-
- butuzov
240199
- idvoretskyi
241200
- MaxymVlasov
242201
- Potapy4

README-ja.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Hugo(Extended version)を使用してWebサイトをローカルで実行する
1616
このリポジトリを使用するには、以下をローカルにインストールする必要があります。
1717

1818
- [npm](https://www.npmjs.com/)
19-
- [Go](https://golang.org/)
19+
- [Go](https://go.dev/)
2020
- [Hugo(Extended version)](https://gohugo.io/)
2121
- [Docker](https://www.docker.com/)などのコンテナランタイム
2222

README-pt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Você pode executar o website localmente utilizando o Hugo (versão Extended), o
1313
Para usar este repositório, você precisa instalar:
1414

1515
- [npm](https://www.npmjs.com/)
16-
- [Go](https://golang.org/)
16+
- [Go](https://go.dev/)
1717
- [Hugo (versão Extended)](https://gohugo.io/)
1818
- Um container runtime, por exemplo [Docker](https://www.docker.com/).
1919

README-ru.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Чтобы работать с этим репозиторием, понадобятся следующие компоненты, установленные локально:
1414

1515
- [npm](https://www.npmjs.com/)
16-
- [Go](https://golang.org/)
16+
- [Go](https://go.dev/)
1717
- [Hugo (Extended version)](https://gohugo.io/)
1818
- Исполняемая среда для контейнеров вроде [Docker](https://www.docker.com/)
1919

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,18 @@ cd website
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-
```bash
33-
# pull in the Docsy submodule
32+
### Windows
33+
```powershell
34+
# fetch submodule dependencies
3435
git submodule update --init --recursive --depth 1
3536
```
3637

38+
### Linux / other Unix
39+
```bash
40+
# fetch submodule dependencies
41+
make module-init
42+
```
43+
3744
## Running the website using a container
3845

3946
To build the site in a container, run the following:

assets/scss/_base.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,10 @@ section#cncf {
861861
// nav-tabs and tab-content
862862
.nav-tabs {
863863
border-bottom: none !important;
864+
865+
.nav-item {
866+
margin-bottom: 0;
867+
}
864868
}
865869

866870
.td-content .tab-content .highlight {

assets/scss/_custom.scss

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ body.td-404 main .error-details {
163163
margin-top: 3.5rem !important;
164164
}
165165

166-
@media only screen and (min-width: 1075px) {
166+
@media only screen and (min-width: 1170px) {
167167
margin-top: 1rem !important;
168168
}
169169
}
@@ -878,3 +878,17 @@ div.alert > em.javascript-required {
878878
color: #fff;
879879
background: #326de6;
880880
}
881+
882+
// Adjust Bing search result page
883+
#bing-results-container {
884+
padding: 1em;
885+
}
886+
#bing-pagination-container {
887+
padding: 1em;
888+
margin-bottom: 1em;
889+
890+
a.bing-page-anchor {
891+
padding: 0.5em;
892+
margin: 0.25em;
893+
}
894+
}

content/en/_index.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
{{% blocks/feature image="suitcase" %}}
3131
#### Run K8s Anywhere
3232

33-
Kubernetes is open source giving you the freedom to take advantage of on-premises, hybrid, or public cloud infrastructure, letting you effortlessly move workloads to where it matters to you.
33+
Kubernetes is open source giving you the freedom to take advantage of on-premises, hybrid, or public cloud infrastructure, letting you effortlessly move workloads to where it matters to you.
34+
35+
To download Kubernetes, visit the [download](/releases/download/) section.
3436

3537
{{% /blocks/feature %}}
3638

@@ -43,12 +45,12 @@ <h2>The Challenges of Migrating 150+ Microservices to Kubernetes</h2>
4345
<button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
4446
<br>
4547
<br>
46-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america" button id="desktopKCButton">Attend KubeCon North America on October 24-28, 2022</a>
48+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Attend KubeCon + CloudNativeCon Europe on April 18-21, 2023</a>
4749
<br>
4850
<br>
4951
<br>
5052
<br>
51-
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Attend KubeCon Europe on April 17-21, 2023</a>
53+
<a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" button id="desktopKCButton">Attend KubeCon + CloudNativeCon North America on November 6-9, 2023</a>
5254
</div>
5355
<div id="videoPlayer">
5456
<iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>

0 commit comments

Comments
 (0)