mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-23 02:26:52 +00:00
Merge pull request #16930 from ihmccreery/release-wording-fixes
Auto commit by PR queue bot
This commit is contained in:
commit
6983f75ef7
@ -145,7 +145,7 @@ export VER="vX.Y.0-alpha.W"
|
|||||||
then, run
|
then, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}"
|
./release/cut-official-release.sh "${VER}" "${GITHASH}"
|
||||||
```
|
```
|
||||||
|
|
||||||
This will do a dry run of:
|
This will do a dry run of:
|
||||||
@ -157,7 +157,7 @@ This will do a dry run of:
|
|||||||
If you're satisfied with the result, run
|
If you're satisfied with the result, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
||||||
```
|
```
|
||||||
|
|
||||||
and follow the instructions.
|
and follow the instructions.
|
||||||
@ -173,7 +173,7 @@ export VER="vX.Y.Z-beta.W"
|
|||||||
then, run
|
then, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}"
|
./release/cut-official-release.sh "${VER}" "${GITHASH}"
|
||||||
```
|
```
|
||||||
|
|
||||||
This will do a dry run of:
|
This will do a dry run of:
|
||||||
@ -186,7 +186,7 @@ This will do a dry run of:
|
|||||||
If you're satisfied with the result, run
|
If you're satisfied with the result, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
||||||
```
|
```
|
||||||
|
|
||||||
and follow the instructions.
|
and follow the instructions.
|
||||||
@ -202,7 +202,7 @@ export VER="vX.Y.Z"
|
|||||||
then, run
|
then, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}"
|
./release/cut-official-release.sh "${VER}" "${GITHASH}"
|
||||||
```
|
```
|
||||||
|
|
||||||
This will do a dry run of:
|
This will do a dry run of:
|
||||||
@ -218,7 +218,7 @@ This will do a dry run of:
|
|||||||
If you're satisfied with the result, run
|
If you're satisfied with the result, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
||||||
```
|
```
|
||||||
|
|
||||||
and follow the instructions.
|
and follow the instructions.
|
||||||
@ -238,7 +238,7 @@ export VER="vX.Y"
|
|||||||
then, run
|
then, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}"
|
./release/cut-official-release.sh "${VER}" "${GITHASH}"
|
||||||
```
|
```
|
||||||
|
|
||||||
This will do a dry run of:
|
This will do a dry run of:
|
||||||
@ -253,7 +253,7 @@ This will do a dry run of:
|
|||||||
If you're satisfied with the result, run
|
If you're satisfied with the result, run
|
||||||
|
|
||||||
```console
|
```console
|
||||||
release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run
|
||||||
```
|
```
|
||||||
|
|
||||||
and follow the instructions.
|
and follow the instructions.
|
||||||
|
@ -50,6 +50,9 @@ VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-(beta|alph
|
|||||||
echo "!!! You must specify the version you are releasing in the form of '${VERSION_REGEX}'" >&2
|
echo "!!! You must specify the version you are releasing in the form of '${VERSION_REGEX}'" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
VERSION_MAJOR="${BASH_REMATCH[1]}"
|
||||||
|
VERSION_MINOR="${BASH_REMATCH[2]}"
|
||||||
|
RELEASE_BRANCH="release-${VERSION_MAJOR}.${VERSION_MINOR}"
|
||||||
|
|
||||||
declare -r KUBE_BUILD_DIR=$(mktemp -d "/tmp/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX")
|
declare -r KUBE_BUILD_DIR=$(mktemp -d "/tmp/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX")
|
||||||
|
|
||||||
@ -93,15 +96,23 @@ cat <<- EOM
|
|||||||
Success! You must now do the following (you may want to cut and paste these
|
Success! You must now do the following (you may want to cut and paste these
|
||||||
instructions elsewhere):
|
instructions elsewhere):
|
||||||
|
|
||||||
1) (cd ${KUBE_BUILD_DIR}; build/push-official-release.sh ${KUBE_RELEASE_VERSION})
|
1) pushd ${KUBE_BUILD_DIR}; build/push-official-release.sh ${KUBE_RELEASE_VERSION}
|
||||||
2) Go to https://github.com/GoogleCloudPlatform/kubernetes/releases
|
|
||||||
and create a new 'Release ${KUBE_RELEASE_VERSION} Candidate' release
|
|
||||||
with the ${KUBE_RELEASE_VERSION} tag. Mark it as a pre-release.
|
|
||||||
3) Upload the ${KUBE_BUILD_DIR}/kubernetes.tar.gz to GitHub
|
|
||||||
4) Use this template for the release:
|
|
||||||
|
|
||||||
## [Documentation](http://releases.k8s.io/${KUBE_RELEASE_VERSION}/docs/README.md)
|
2) Go to https://github.com/GoogleCloudPlatform/kubernetes/releases
|
||||||
## [Examples](http://releases.k8s.io/${KUBE_RELEASE_VERSION}/examples)
|
and create a new release with the ${KUBE_RELEASE_VERSION} tag.
|
||||||
|
|
||||||
|
a) Mark it as a pre-release (someone on the GKE team will mark it as an
|
||||||
|
official release when it's being rolled out, but should not be considered
|
||||||
|
stable prior to that).
|
||||||
|
|
||||||
|
b) Title it:
|
||||||
|
|
||||||
|
Release ${KUBE_RELEASE_VERSION}
|
||||||
|
|
||||||
|
c) Use this template for the description:
|
||||||
|
|
||||||
|
## [Documentation](http://releases.k8s.io/${RELEASE_BRANCH}/docs/README.md)
|
||||||
|
## [Examples](http://releases.k8s.io/${RELEASE_BRANCH}/examples)
|
||||||
## Changes since <last release> (last PR <last PR>)
|
## Changes since <last release> (last PR <last PR>)
|
||||||
|
|
||||||
<release notes>
|
<release notes>
|
||||||
@ -112,7 +123,11 @@ binary | hash alg | hash
|
|||||||
\`kubernetes.tar.gz\` | sha1 | \`${SHA1}\`
|
\`kubernetes.tar.gz\` | sha1 | \`${SHA1}\`
|
||||||
|
|
||||||
We'll fill in the release notes in the next stage.
|
We'll fill in the release notes in the next stage.
|
||||||
5) Ensure all the binaries are in place on GitHub and GCS before cleaning.
|
|
||||||
6) (cd ${KUBE_BUILD_DIR}; make clean; cd -; rm -rf ${KUBE_BUILD_DIR})
|
3) Upload the ${KUBE_BUILD_DIR}/kubernetes.tar.gz to GitHub
|
||||||
|
|
||||||
|
4) Ensure all the binaries are in place on GitHub and GCS before cleaning.
|
||||||
|
|
||||||
|
5) (make clean; popd; rm -rf ${KUBE_BUILD_DIR})
|
||||||
|
|
||||||
EOM
|
EOM
|
||||||
|
Loading…
Reference in New Issue
Block a user