diff --git a/.github/workflows/update-schedule.yml b/.github/workflows/update-schedule.yml new file mode 100644 index 0000000000000..43a6e09a33d03 --- /dev/null +++ b/.github/workflows/update-schedule.yml @@ -0,0 +1,46 @@ +name: Update schedule.yaml +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * *' # daily +jobs: + create-pull-request: + name: Create PR (if required) + 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.7 + + - 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 diff --git a/content/en/releases/patch-releases.md b/content/en/releases/patch-releases.md index ac275027489c3..8f39a86dd2ce1 100644 --- a/content/en/releases/patch-releases.md +++ b/content/en/releases/patch-releases.md @@ -78,9 +78,9 @@ releases may also occur in between these. | Monthly Patch Release | Cherry Pick Deadline | Target date | | --------------------- | -------------------- | ----------- | -| March 2024 | 2024-03-08 | 2024-03-13 | | April 2024 | 2024-04-12 | 2024-04-17 | | May 2024 | 2024-05-10 | 2024-05-15 | +| June 2024 | 2024-06-07 | 2024-06-11 | ## Detailed Release History for Active Branches diff --git a/data/releases/eol.yaml b/data/releases/eol.yaml index c1d0c70d2d718..9d9045eed1088 100644 --- a/data/releases/eol.yaml +++ b/data/releases/eol.yaml @@ -1,4 +1,7 @@ branches: + - release: "1.26" + finalPatchRelease: "1.25.15" + endOfLifeDate: 2024-02-28 - release: "1.25" finalPatchRelease: "1.25.16" endOfLifeDate: 2023-10-28 diff --git a/data/releases/schedule.yaml b/data/releases/schedule.yaml index 70f9c4c3d622e..3893870f17e2f 100644 --- a/data/releases/schedule.yaml +++ b/data/releases/schedule.yaml @@ -1,162 +1,104 @@ ---- -# This file helps to populate the /releases page, and is also parsed to find out the -# latest patch version for a minor release. schedules: -- release: 1.29 - releaseDate: 2023-12-13 +- endOfLifeDate: "2025-02-28" + maintenanceModeStartDate: "2024-12-28" next: - release: 1.29.3 - cherryPickDeadline: 2024-03-08 - targetDate: 2024-03-12 - maintenanceModeStartDate: 2024-12-28 - endOfLifeDate: 2025-02-28 - previousPatches: - - release: 1.29.2 - cherryPickDeadline: 2024-02-09 - targetDate: 2024-02-14 - - release: 1.29.1 - cherryPickDeadline: 2024-01-12 - targetDate: 2024-01-17 - - release: 1.29.0 - targetDate: 2023-12-13 -- release: 1.28 - releaseDate: 2023-08-15 - next: - release: 1.28.8 - cherryPickDeadline: 2024-03-08 - targetDate: 2024-03-12 - maintenanceModeStartDate: 2024-08-28 - endOfLifeDate: 2024-10-28 + cherryPickDeadline: "2024-04-05" + release: 1.29.4 + targetDate: "2024-04-09" previousPatches: - - release: 1.28.7 - cherryPickDeadline: 2024-02-09 - targetDate: 2024-02-14 - - release: 1.28.6 - cherryPickDeadline: 2023-01-12 - targetDate: 2024-01-17 - - release: 1.28.5 - cherryPickDeadline: 2023-12-15 - targetDate: 2023-12-20 - - release: 1.28.4 - cherryPickDeadline: "" - targetDate: 2023-11-14 - note: >- - Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ) - - release: 1.28.3 - cherryPickDeadline: 2023-10-13 - targetDate: 2023-10-18 - - release: 1.28.2 - cherryPickDeadline: 2023-09-08 - targetDate: 2023-09-13 - - release: 1.28.1 - cherryPickDeadline: N/A - targetDate: 2023-08-23 - note: >- - Unplanned release to include CVE fixes - - release: 1.28.0 - targetDate: 2023-08-15 -- release: 1.27 - releaseDate: 2023-04-11 - maintenanceModeStartDate: 2024-04-28 - endOfLifeDate: 2024-06-28 + - cherryPickDeadline: "2024-03-08" + release: 1.29.3 + targetDate: "2024-03-12" + - cherryPickDeadline: "2024-02-09" + release: 1.29.2 + targetDate: "2024-02-14" + - cherryPickDeadline: "2024-01-12" + release: 1.29.1 + targetDate: "2024-01-17" + - release: 1.29.0 + targetDate: "2023-12-13" + release: "1.29" + releaseDate: "2023-12-13" +- endOfLifeDate: "2024-10-28" + maintenanceModeStartDate: "2024-08-28" next: - release: 1.27.12 - cherryPickDeadline: 2024-03-08 - targetDate: 2024-03-13 + cherryPickDeadline: "2024-04-05" + release: 1.28.9 + targetDate: "2024-04-09" previousPatches: - - release: 1.27.11 - cherryPickDeadline: 2024-02-09 - targetDate: 2024-02-14 - - release: 1.27.10 - cherryPickDeadline: 2023-01-12 - targetDate: 2024-01-17 - - release: 1.27.9 - cherryPickDeadline: 2023-12-15 - targetDate: 2023-12-20 - - release: 1.27.8 - cherryPickDeadline: "" - targetDate: 2023-11-14 - note: >- - Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ) - - release: 1.27.7 - cherryPickDeadline: 2023-10-13 - targetDate: 2023-10-18 - - release: 1.27.6 - cherryPickDeadline: 2023-09-08 - targetDate: 2023-09-13 - - release: 1.27.5 - cherryPickDeadline: 2023-08-04 - targetDate: 2023-08-23 - - release: 1.27.4 - cherryPickDeadline: 2023-07-14 - targetDate: 2023-07-19 - - release: 1.27.3 - cherryPickDeadline: 2023-06-09 - targetDate: 2023-06-14 - - release: 1.27.2 - cherryPickDeadline: 2023-05-12 - targetDate: 2023-05-17 - - release: 1.27.1 - cherryPickDeadline: "" - targetDate: 2023-04-14 - note: >- - [Regression](https://groups.google.com/g/kubernetes-announce/c/9FTKjmIFOTw/m/TH6cJT64AAAJ) - - release: 1.27.0 - cherryPickDeadline: "" - targetDate: 2023-04-11 -- release: 1.26 - releaseDate: 2022-12-09 - maintenanceModeStartDate: 2023-12-28 - endOfLifeDate: 2024-02-28 + - cherryPickDeadline: "2024-03-08" + release: 1.28.8 + targetDate: "2024-03-12" + - cherryPickDeadline: "2024-02-09" + release: 1.28.7 + targetDate: "2024-02-14" + - cherryPickDeadline: "2023-01-12" + release: 1.28.6 + targetDate: "2024-01-17" + - cherryPickDeadline: "2023-12-15" + release: 1.28.5 + targetDate: "2023-12-20" + - note: Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ) + release: 1.28.4 + targetDate: "2023-11-14" + - cherryPickDeadline: "2023-10-13" + release: 1.28.3 + targetDate: "2023-10-18" + - cherryPickDeadline: "2023-09-08" + release: 1.28.2 + targetDate: "2023-09-13" + - cherryPickDeadline: N/A + note: Unplanned release to include CVE fixes + release: 1.28.1 + targetDate: "2023-08-23" + - release: 1.28.0 + targetDate: "2023-08-15" + release: "1.28" + releaseDate: "2023-08-15" +- endOfLifeDate: "2024-06-28" + maintenanceModeStartDate: "2024-04-28" next: - release: Not Planned + cherryPickDeadline: "2024-04-05" + release: 1.27.13 + targetDate: "2024-04-09" previousPatches: - - release: 1.26.14 - cherryPickDeadline: 2024-02-09 - targetDate: 2024-02-14 - - release: 1.26.13 - cherryPickDeadline: 2023-01-12 - targetDate: 2024-01-17 - - release: 1.26.12 - cherryPickDeadline: 2023-12-15 - targetDate: 2023-12-20 - - release: 1.26.11 - cherryPickDeadline: "" - targetDate: 2023-11-14 - note: >- - Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ) - - release: 1.26.10 - cherryPickDeadline: 2023-10-13 - targetDate: 2023-10-18 - - release: 1.26.9 - cherryPickDeadline: 2023-09-08 - targetDate: 2023-09-13 - - release: 1.26.8 - cherryPickDeadline: 2023-08-04 - targetDate: 2023-08-23 - - release: 1.26.7 - cherryPickDeadline: 2023-07-14 - targetDate: 2023-07-19 - - release: 1.26.6 - cherryPickDeadline: 2023-06-09 - targetDate: 2023-06-14 - - release: 1.26.5 - cherryPickDeadline: 2023-05-12 - targetDate: 2023-05-17 - - release: 1.26.4 - cherryPickDeadline: 2023-04-07 - targetDate: 2023-04-12 - - release: 1.26.3 - cherryPickDeadline: 2023-03-10 - targetDate: 2023-03-15 - - release: 1.26.2 - cherryPickDeadline: 2023-02-10 - targetDate: 2023-02-15 - note: >- - [Some container images might be **unsigned** due to a temporary issue with the promotion process](https://groups.google.com/a/kubernetes.io/g/dev/c/MwSx761slM0/m/4ajkeUl0AQAJ) - - release: 1.26.1 - cherryPickDeadline: 2023-01-13 - targetDate: 2023-01-18 - - release: 1.26.0 - cherryPickDeadline: "" - targetDate: 2022-12-09 + - cherryPickDeadline: "2024-03-08" + release: 1.27.12 + targetDate: "2024-03-13" + - cherryPickDeadline: "2024-02-09" + release: 1.27.11 + targetDate: "2024-02-14" + - cherryPickDeadline: "2023-01-12" + release: 1.27.10 + targetDate: "2024-01-17" + - cherryPickDeadline: "2023-12-15" + release: 1.27.9 + targetDate: "2023-12-20" + - note: Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ) + release: 1.27.8 + targetDate: "2023-11-14" + - cherryPickDeadline: "2023-10-13" + release: 1.27.7 + targetDate: "2023-10-18" + - cherryPickDeadline: "2023-09-08" + release: 1.27.6 + targetDate: "2023-09-13" + - cherryPickDeadline: "2023-08-04" + release: 1.27.5 + targetDate: "2023-08-23" + - cherryPickDeadline: "2023-07-14" + release: 1.27.4 + targetDate: "2023-07-19" + - cherryPickDeadline: "2023-06-09" + release: 1.27.3 + targetDate: "2023-06-14" + - cherryPickDeadline: "2023-05-12" + release: 1.27.2 + targetDate: "2023-05-17" + - note: '[Regression](https://groups.google.com/g/kubernetes-announce/c/9FTKjmIFOTw/m/TH6cJT64AAAJ)' + release: 1.27.1 + targetDate: "2023-04-14" + - release: 1.27.0 + targetDate: "2023-04-11" + release: "1.27" + releaseDate: "2023-04-11" diff --git a/layouts/shortcodes/release-branches.html b/layouts/shortcodes/release-branches.html index cdd07c0746f8a..812543659cec1 100644 --- a/layouts/shortcodes/release-branches.html +++ b/layouts/shortcodes/release-branches.html @@ -1,6 +1,6 @@ {{ range $releaseInfo := .Site.Data.releases.schedule.schedules }} -{{- $version := printf "%.2f" $releaseInfo.release -}} -{{- $dataIdVersion := replace ( printf "%.2f" $releaseInfo.release ) "." "-" | anchorize -}} +{{- $version := $releaseInfo.release -}} +{{- $dataIdVersion := replace ( $releaseInfo.release ) "." "-" | anchorize -}}

{{ $version }}

diff --git a/layouts/shortcodes/release-data.html b/layouts/shortcodes/release-data.html index e021b38799616..1adaca2297b9c 100644 --- a/layouts/shortcodes/release-data.html +++ b/layouts/shortcodes/release-data.html @@ -1,6 +1,6 @@ {{ range $data := .Site.Data.releases.schedule.schedules }} -{{- $dataVersion := printf "%.2f" $data.release -}} -{{- $dataIdVersion := replace ( printf "%.2f" $data.release ) "." "-" | anchorize -}} +{{- $dataVersion := $data.release -}} +{{- $dataIdVersion := replace ( $data.release ) "." "-" | anchorize -}}

{{ $dataVersion }}