Merge pull request #391 from Jiawei0227/prow-update-master
master: update release-tools
This commit is contained in:
@@ -39,10 +39,11 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
|||||||
1. Changes can then be updated in all the sidecar repos and hostpath driver repo
|
1. Changes can then be updated in all the sidecar repos and hostpath driver repo
|
||||||
by following the [update
|
by following the [update
|
||||||
instructions](https://github.com/kubernetes-csi/csi-release-tools/blob/master/README.md#sharing-and-updating).
|
instructions](https://github.com/kubernetes-csi/csi-release-tools/blob/master/README.md#sharing-and-updating).
|
||||||
1. New pull and CI jobs are configured by
|
1. New pull and CI jobs are configured by adding new K8s versions to the top of
|
||||||
[gen-jobs.sh](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-csi/gen-jobs.sh).
|
[gen-jobs.sh](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-csi/gen-jobs.sh).
|
||||||
New pull jobs that have been unverified should be initially made optional.
|
New pull jobs that have been unverified should be initially made optional by
|
||||||
[Example](https://github.com/kubernetes/test-infra/pull/15055)
|
setting the new K8s version as
|
||||||
|
[experimental](https://github.com/kubernetes/test-infra/blob/a1858f46d6014480b130789df58b230a49203a64/config/jobs/kubernetes-csi/gen-jobs.sh#L40).
|
||||||
1. Once new pull and CI jobs have been verified, and the new Kubernetes version
|
1. Once new pull and CI jobs have been verified, and the new Kubernetes version
|
||||||
is released, we can make the optional jobs required, and also remove the
|
is released, we can make the optional jobs required, and also remove the
|
||||||
Kubernetes versions that are no longer supported.
|
Kubernetes versions that are no longer supported.
|
||||||
@@ -54,14 +55,19 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
|||||||
generator](https://github.com/kubernetes/release/tree/master/cmd/release-notes)
|
generator](https://github.com/kubernetes/release/tree/master/cmd/release-notes)
|
||||||
1. Generate release notes for the release. Replace arguments with the relevant
|
1. Generate release notes for the release. Replace arguments with the relevant
|
||||||
information.
|
information.
|
||||||
|
* Clean up old cached information (also needed if you are generating release
|
||||||
|
notes for multiple repos)
|
||||||
|
```bash
|
||||||
|
rm -rf /tmp/k8s-repo
|
||||||
|
```
|
||||||
* For new minor releases on master:
|
* For new minor releases on master:
|
||||||
```
|
```bash
|
||||||
GITHUB_TOKEN=<token> release-notes --discover=mergebase-to-latest
|
GITHUB_TOKEN=<token> release-notes --discover=mergebase-to-latest
|
||||||
--github-org=kubernetes-csi --github-repo=external-provisioner
|
--github-org=kubernetes-csi --github-repo=external-provisioner
|
||||||
--required-author="" --output out.md
|
--required-author="" --output out.md
|
||||||
```
|
```
|
||||||
* For new patch releases on a release branch:
|
* For new patch releases on a release branch:
|
||||||
```
|
```bash
|
||||||
GITHUB_TOKEN=<token> release-notes --discover=patch-to-latest --branch=release-1.1
|
GITHUB_TOKEN=<token> release-notes --discover=patch-to-latest --branch=release-1.1
|
||||||
--github-org=kubernetes-csi --github-repo=external-provisioner
|
--github-org=kubernetes-csi --github-repo=external-provisioner
|
||||||
--required-author="" --output out.md
|
--required-author="" --output out.md
|
||||||
|
@@ -211,6 +211,10 @@ configvar CSI_PROW_DRIVER_INSTALL "install_csi_driver" "name of the shell functi
|
|||||||
# still use that name.
|
# still use that name.
|
||||||
configvar CSI_PROW_DRIVER_CANARY "${CSI_PROW_HOSTPATH_CANARY}" "driver image override for canary images"
|
configvar CSI_PROW_DRIVER_CANARY "${CSI_PROW_HOSTPATH_CANARY}" "driver image override for canary images"
|
||||||
|
|
||||||
|
# Image registry to use for canary images.
|
||||||
|
# Only valid if CSI_PROW_DRIVER_CANARY == "canary".
|
||||||
|
configvar CSI_PROW_DRIVER_CANARY_REGISTRY "gcr.io/k8s-staging-sig-storage" "registry for canary images"
|
||||||
|
|
||||||
# The E2E testing can come from an arbitrary repo. The expectation is that
|
# The E2E testing can come from an arbitrary repo. The expectation is that
|
||||||
# the repo supports "go test ./test/e2e -args --storage.testdriver" (https://github.com/kubernetes/kubernetes/pull/72836)
|
# the repo supports "go test ./test/e2e -args --storage.testdriver" (https://github.com/kubernetes/kubernetes/pull/72836)
|
||||||
# after setting KUBECONFIG. As a special case, if the repository is Kubernetes,
|
# after setting KUBECONFIG. As a special case, if the repository is Kubernetes,
|
||||||
@@ -693,7 +697,11 @@ install_csi_driver () {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${CSI_PROW_DRIVER_CANARY}" != "stable" ]; then
|
if [ "${CSI_PROW_DRIVER_CANARY}" != "stable" ]; then
|
||||||
|
if [ "${CSI_PROW_DRIVER_CANARY}" == "canary" ]; then
|
||||||
|
images="$images IMAGE_TAG=${CSI_PROW_DRIVER_CANARY} IMAGE_REGISTRY=${CSI_PROW_DRIVER_CANARY_REGISTRY}"
|
||||||
|
else
|
||||||
images="$images IMAGE_TAG=${CSI_PROW_DRIVER_CANARY}"
|
images="$images IMAGE_TAG=${CSI_PROW_DRIVER_CANARY}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
# Ignore: Double quote to prevent globbing and word splitting.
|
# Ignore: Double quote to prevent globbing and word splitting.
|
||||||
# It's intentional here for $images.
|
# It's intentional here for $images.
|
||||||
|
Reference in New Issue
Block a user