Skip to content

Commit f9610cd

Browse files
authored
Merge pull request #47986 from chanieljdan/merged-main-dev-1.32
Merge main branch into dev 1.32
2 parents 831e8a9 + f005d8c commit f9610cd

File tree

981 files changed

+107343
-29484
lines changed

Some content is hidden

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

981 files changed

+107343
-29484
lines changed

.github/workflows/update-schedule.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Update schedule.yaml
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 0 * * *' # daily
6+
jobs:
7+
create-pull-request:
8+
name: Create PR (if required)
9+
permissions:
10+
contents: write
11+
pull-requests: write
12+
if: github.repository == 'kubernetes/website'
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Check out repository code
16+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
17+
with:
18+
fetch-depth: 0
19+
20+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
21+
with:
22+
go-version: '1.22'
23+
check-latest: true
24+
25+
- name: Install schedule-builder
26+
run: go install k8s.io/release/cmd/[email protected]
27+
28+
- name: Update schedule.yaml
29+
run: schedule-builder -uc data/releases/schedule.yaml -e data/releases/eol.yaml
30+
31+
- name: Check workspace
32+
id: create_pr
33+
run: |
34+
if [[ $(git diff --stat) != '' ]]; then
35+
echo "create_pr=true" >> "$GITHUB_OUTPUT"
36+
fi
37+
38+
- name: Create Pull Request
39+
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2
40+
if: ${{ steps.create_pr.outputs.create_pr == 'true' }}
41+
with:
42+
token: ${{ secrets.GITHUB_TOKEN }}
43+
commit-message: Update schedule.yaml
44+
title: Update release schedule.yaml
45+
body: |
46+
Update release schedule.yaml
47+
48+
/cc @kubernetes/release-managers
49+
labels: area/release-eng, sig/release, sig/docs
50+
branch: update-schedule
51+
delete-branch: true
52+
signoff: true

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# change is that the Hugo version is now an overridable argument rather than a fixed
55
# environment variable.
66

7-
FROM docker.io/library/golang:1.20-alpine
7+
FROM docker.io/library/golang:1.23.0-alpine3.20
88

99
LABEL maintainer="Luc Perkins <[email protected]>"
1010

@@ -24,7 +24,7 @@ RUN mkdir $HOME/src && \
2424
cd "hugo-${HUGO_VERSION}" && \
2525
go install --tags extended
2626

27-
FROM docker.io/library/golang:1.20-alpine
27+
FROM docker.io/library/golang:1.23.0-alpine3.20
2828

2929
RUN apk add --no-cache \
3030
runuser \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ container-push: container-image ## Push container image for the preview of the w
8181

8282
PLATFORMS ?= linux/arm64,linux/amd64
8383
docker-push: ## Build a multi-architecture image and push that into the registry
84-
docker run --rm --privileged tonistiigi/binfmt:qemu-v6.2.0-26@sha256:5bf63a53ad6222538112b5ced0f1afb8509132773ea6dd3991a197464962854e --install all
84+
docker run --rm --privileged tonistiigi/binfmt:qemu-v8.1.5-43@sha256:46c5a036f13b8ad845d6703d38f8cce6dd7c0a1e4d42ac80792279cabaeff7fb --install all
8585
docker version
8686
$(DOCKER_BUILDX) version
8787
$(DOCKER_BUILDX) inspect image-builder > /dev/null 2>&1 || $(DOCKER_BUILDX) create --name image-builder --use

OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ aliases:
108108
- bishal7679
109109
- dipesh-rawat
110110
- divya-mohan0209
111+
- niranjandarshann
111112
sig-docs-id-owners: # Admins for Indonesian content
112113
- ariscahyadi
113114
- danninov

README-bn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
186186

187187
| Name | Slack | GitHub |
188188
| -------------------------- | -------------------------- | -------------------------- |
189-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
189+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
190190

191191
## Localization READMEs
192192

README-es.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ El sitio web de Kubernetes utiliza Docsy Hugo theme. Se sugiere que se instale s
3636
```bash
3737
# pull de los submódulos del repositorio
3838
git submodule update --init --recursive --depth 1
39-
4039
```
4140

4241
Si identifica que `git` reconoce una cantidad innumerable de cambios nuevos en el proyecto, la forma más simple de solucionarlo es cerrando y volviendo a abrir el proyecto en el editor. Los submódulos son automáticamente detectados por `git`, pero los plugins usados por los editores pueden tener dificultades para ser cargados.

README-ja.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,19 @@ make container-serve
6464
ローカルで依存関係をインストールし、サイトを構築してテストするには、次のコマンドを実行します。
6565

6666
- For macOS and Linux
67+
6768
```bash
6869
npm ci
6970
make serve
7071
```
72+
7173
- For Windows (PowerShell)
74+
7275
```powershell
7376
npm ci
7477
hugo.exe server --buildFuture --environment development
7578
```
76-
79+
7780
これで、Hugoのサーバーが1313番ポートを使って起動します。使用しているブラウザで<http://localhost:1313>にアクセスしてください。リポジトリ内のソースファイルに変更を加えると、HugoがWebサイトの内容を更新してブラウザに反映します。
7881

7982
## API reference pagesをビルドする
@@ -196,7 +199,7 @@ Kubernetesのドキュメントへの貢献に関する詳細については以
196199

197200
| 名前 | Slack | GitHub |
198201
| -------------------------- | -------------------------- | -------------------------- |
199-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
202+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
200203

201204
## 翻訳された`README.md`一覧 {#localization-readmemds}
202205

README-ko.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
173173

174174
| Name | Slack | GitHub |
175175
| -------------------------- | -------------------------- | -------------------------- |
176-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
176+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
177177

178178
# `README.md`에 대한 쿠버네티스 문서 현지화(localization) {#localization-readmemds}
179179

README-pt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ Caso você precise de ajuda em algum momento ao contribuir, os [Embaixadores par
187187

188188
| Nome | Slack | GitHub |
189189
| -------------------------- | -------------------------- | -------------------------- |
190-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
190+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
191191

192192
## Traduções do `README.md`
193193

README-uk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
186186

187187
| Імʼя | Slack | GitHub |
188188
| -------------------------- | -------------------------- | -------------------------- |
189-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
189+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
190190

191191
## Локалізовані файли README
192192

README-vi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Nếu bạn cần trợ giúp bất kỳ lúc nào khi đóng góp, [Đại sứ
194194

195195
| Name | Slack | GitHub |
196196
| -------------------------- | -------------------------- | -------------------------- |
197-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
197+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
198198

199199
## Các tệp README đa ngôn ngữ
200200

README-zh.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,14 @@ If you need help at any point when contributing, the [New Contributor Ambassador
429429
SIG Docs 的当前新贡献者大使:
430430

431431
<!--
432-
| Name | Slack | GitHub |
432+
| Name | Slack | GitHub |
433433
| -------------------------- | -------------------------- | -------------------------- |
434-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
434+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
435435
-->
436436
| 姓名 | Slack | GitHub |
437437
| -------------------------- | -------------------------- | -------------------------- |
438-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
438+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
439+
439440

440441
<!--
441442
## Localization READMEs

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ cd website
3333
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:
3434

3535
### Windows
36+
3637
```powershell
3738
# fetch submodule dependencies
3839
git submodule update --init --recursive --depth 1
3940
```
4041

4142
### Linux / other Unix
43+
4244
```bash
4345
# fetch submodule dependencies
4446
make module-init
@@ -62,11 +64,14 @@ Open up your browser to <http://localhost:1313> to view the website. As you make
6264
To install dependencies, deploy and test the site locally, run:
6365

6466
- For macOS and Linux
67+
6568
```bash
6669
npm ci
6770
make serve
6871
```
72+
6973
- For Windows (PowerShell)
74+
7075
```powershell
7176
npm ci
7277
hugo.exe server --buildFuture --environment development

0 commit comments

Comments
 (0)