Skip to content

Commit 7d34cf1

Browse files
authored
Merge branch 'kubernetes:main' into patch-1
2 parents 8bd52f7 + 0585ffd commit 7d34cf1

File tree

1,183 files changed

+148516
-34891
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,183 files changed

+148516
-34891
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<!--
2-
32
Hello!
43
5-
Remember to ADD A DESCRIPTION and delete this note before submitting
6-
your pull request. The description should explain what will change,
7-
and why.
8-
94
PLEASE title the FIRST commit appropriately, so that if you squash all
105
your commits into one, the combined commit message makes sense.
116
For overall help on editing and submitting pull requests, visit:
@@ -20,5 +15,24 @@
2015
2116
If you're documenting a feature that will be part of a future release, see
2217
https://kubernetes.io/docs/contribute/new-content/new-features/ for advice.
18+
-->
19+
### Description
2320

21+
<!--
22+
Remember to ADD A DESCRIPTION and delete this note before submitting
23+
your pull request. The description should explain what will change,
24+
and why.
25+
-->
26+
27+
### Issue
28+
29+
<!--
30+
If this pull request resolves an open issue, please link the issue in the PR
31+
description so it will automatically close when the PR is merged.
32+
33+
See the GitHub documentation for more details and other options:
34+
35+
https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
2436
-->
37+
38+
Closes: #

.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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ aliases:
1616
- salaxander
1717
- sftim
1818
- tengqm
19+
- drewhagen # RT 1.31 temp acting Docs lead
1920
sig-docs-localization-owners: # Admins for localization content
2021
- a-mccarthy
2122
- divya-mohan0209
@@ -64,6 +65,7 @@ aliases:
6465
- sftim
6566
- tengqm
6667
- Princesso # RT 1.31 Docs Lead
68+
- drewhagen # RT 1.31 temp acting Docs lead
6769
sig-docs-en-reviews: # PR reviews for English content
6870
- dipesh-rawat
6971
- divya-mohan0209
@@ -80,6 +82,7 @@ aliases:
8082
- tengqm
8183
- windsonsea
8284
- Princesso # RT 1.31 Docs Lead
85+
- drewhagen # RT 1.31 temp acting Docs lead
8386
sig-docs-es-owners: # Admins for Spanish content
8487
- electrocucaracha
8588
- krol3
@@ -127,6 +130,7 @@ aliases:
127130
- bells17
128131
- inductor
129132
- nasa9084
133+
- Okabe-Junya
130134
sig-docs-ja-reviews: # PR reviews for Japanese content
131135
- atoato88
132136
- bells17

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-ja.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Kubernetesのドキュメントへの貢献に関する詳細については以
196196

197197
| 名前 | Slack | GitHub |
198198
| -------------------------- | -------------------------- | -------------------------- |
199-
| Arsh Sharma | @arsh | @RinkiyaKeDad |
199+
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
200200

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

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

0 commit comments

Comments
 (0)