Skip to content

Commit

Permalink
Merge main into dev-1.32 to keep in sync
Browse files Browse the repository at this point in the history
  • Loading branch information
chanieljdan committed Sep 18, 2024
2 parents 10e98d7 + 2a6e5d2 commit f005d8c
Show file tree
Hide file tree
Showing 981 changed files with 107,343 additions and 29,484 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/update-schedule.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Update schedule.yaml
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *' # daily
jobs:
create-pull-request:
name: Create PR (if required)
permissions:
contents: write
pull-requests: write
if: github.repository == 'kubernetes/website'
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '1.22'
check-latest: true

- name: Install schedule-builder
run: go install k8s.io/release/cmd/schedule-builder@v0.16.9

- name: Update schedule.yaml
run: schedule-builder -uc data/releases/schedule.yaml -e data/releases/eol.yaml

- name: Check workspace
id: create_pr
run: |
if [[ $(git diff --stat) != '' ]]; then
echo "create_pr=true" >> "$GITHUB_OUTPUT"
fi
- name: Create Pull Request
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2
if: ${{ steps.create_pr.outputs.create_pr == 'true' }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Update schedule.yaml
title: Update release schedule.yaml
body: |
Update release schedule.yaml
/cc @kubernetes/release-managers
labels: area/release-eng, sig/release, sig/docs
branch: update-schedule
delete-branch: true
signoff: true
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# change is that the Hugo version is now an overridable argument rather than a fixed
# environment variable.

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

LABEL maintainer="Luc Perkins <lperkins@linuxfoundation.org>"

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

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

RUN apk add --no-cache \
runuser \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ container-push: container-image ## Push container image for the preview of the w

PLATFORMS ?= linux/arm64,linux/amd64
docker-push: ## Build a multi-architecture image and push that into the registry
docker run --rm --privileged tonistiigi/binfmt:qemu-v6.2.0-26@sha256:5bf63a53ad6222538112b5ced0f1afb8509132773ea6dd3991a197464962854e --install all
docker run --rm --privileged tonistiigi/binfmt:qemu-v8.1.5-43@sha256:46c5a036f13b8ad845d6703d38f8cce6dd7c0a1e4d42ac80792279cabaeff7fb --install all
docker version
$(DOCKER_BUILDX) version
$(DOCKER_BUILDX) inspect image-builder > /dev/null 2>&1 || $(DOCKER_BUILDX) create --name image-builder --use
Expand Down
1 change: 1 addition & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ aliases:
- bishal7679
- dipesh-rawat
- divya-mohan0209
- niranjandarshann
sig-docs-id-owners: # Admins for Indonesian content
- ariscahyadi
- danninov
Expand Down
2 changes: 1 addition & 1 deletion README-bn.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist

| Name | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |

## Localization READMEs

Expand Down
1 change: 0 additions & 1 deletion README-es.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ El sitio web de Kubernetes utiliza Docsy Hugo theme. Se sugiere que se instale s
```bash
# pull de los submódulos del repositorio
git submodule update --init --recursive --depth 1

```

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.
Expand Down
7 changes: 5 additions & 2 deletions README-ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,19 @@ make container-serve
ローカルで依存関係をインストールし、サイトを構築してテストするには、次のコマンドを実行します。

- For macOS and Linux

```bash
npm ci
make serve
```

- For Windows (PowerShell)

```powershell
npm ci
hugo.exe server --buildFuture --environment development
```

これで、Hugoのサーバーが1313番ポートを使って起動します。使用しているブラウザで<http://localhost:1313>にアクセスしてください。リポジトリ内のソースファイルに変更を加えると、HugoがWebサイトの内容を更新してブラウザに反映します。

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

| 名前 | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |

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

Expand Down
2 changes: 1 addition & 1 deletion README-ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
| Name | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
# `README.md`에 대한 쿠버네티스 문서 현지화(localization) {#localization-readmemds}
Expand Down
2 changes: 1 addition & 1 deletion README-pt.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ Caso você precise de ajuda em algum momento ao contribuir, os [Embaixadores par

| Nome | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |

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

Expand Down
2 changes: 1 addition & 1 deletion README-uk.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist

| Імʼя | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |

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

Expand Down
2 changes: 1 addition & 1 deletion README-vi.md
Original file line number Diff line number Diff line change
Expand Up @@ -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ứ

| Name | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |

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

Expand Down
7 changes: 4 additions & 3 deletions README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -429,13 +429,14 @@ If you need help at any point when contributing, the [New Contributor Ambassador
SIG Docs 的当前新贡献者大使:

<!--
| Name | Slack | GitHub |
| Name | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |
-->
| 姓名 | Slack | GitHub |
| -------------------------- | -------------------------- | -------------------------- |
| Arsh Sharma | @arsh | @RinkiyaKeDad |
| Sreeram Venkitesh | @sreeram.venkitesh | @sreeram-venkitesh |


<!--
## Localization READMEs
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ cd website
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:

### Windows

```powershell
# fetch submodule dependencies
git submodule update --init --recursive --depth 1
```

### Linux / other Unix

```bash
# fetch submodule dependencies
make module-init
Expand All @@ -62,11 +64,14 @@ Open up your browser to <http://localhost:1313> to view the website. As you make
To install dependencies, deploy and test the site locally, run:

- For macOS and Linux

```bash
npm ci
make serve
```

- For Windows (PowerShell)

```powershell
npm ci
hugo.exe server --buildFuture --environment development
Expand Down
Loading

0 comments on commit f005d8c

Please sign in to comment.