Squashed 'release-tools/' changes from 78c0fb7..058a31d
058a31d Merge pull request #301 from kubernetes-csi/dependabot/github_actions/aquasecurity/trivy-action-0.36.0 50b1a35 Bump aquasecurity/trivy-action from 0.35.0 to 0.36.0 9092527 Merge pull request #298 from torredil/trivy-schedule-trigger 2c9aed3 Merge pull request #299 from andyzhangx/patch-12 507ea1e chore: fix broken gcb-docker-gcloud image ab1da0e Run Trivy scan on schedule instead of pull requests de06a09 Merge pull request #297 from andyzhangx/patch-11 fc719f3 fix: Update Go version from 1.25.8 to 1.25.9 c24a730 Merge pull request #296 from jsafrane/pin-github-actions-sha 59b456b fix: pin github action to exact SHA 061f6ee Merge pull request #295 from kubernetes-csi/security/update-trivy-action-v0.35.0 6c16f30 security: Update trivy-action to v0.35.0 119a53c Merge pull request #294 from andyzhangx/patch-10 7c9aa9b fix: upgrade to go1.25.7 to fix CVE-2026-25679 1e81e75 Merge pull request #293 from andyzhangx/patch-9 4dc1850 fix: upgrade to go1.25.7 to fix CVE-2025-61727 b60b9a5 Merge pull request #292 from andyzhangx/patch-8 0e4e2ed Update Go version from 1.25.5 to 1.25.6 to fix CVE 707a99e Merge pull request #291 from dfajmon/logcheck a9d2b0f Bump logcheck to v0.10.0 d684663 Merge pull request #290 from dfajmon/go-1.25.5 55e527c Bump golang to 1.25.5 b12e407 Merge pull request #289 from nixpanic/k8s-v1.34 bbe5e54 Use Kubernetes v1.34 and Kind v0.30 by default 4e9eb2c Merge pull request #288 from gnufied/add-gnufied-for-csi-approver 064e260 Add myself as csi approver c852fa7 Merge pull request #287 from andyzhangx/patch-7 bce16c1 fix: upgrade to go1.24.11 to fix CVE-2025-61727 8d1258c Merge pull request #286 from kubernetes-csi/dependabot/github_actions/actions/checkout-6 91e3598 Bump actions/checkout from 5 to 6 2941381 Merge pull request #285 from andyzhangx/patch-6 fa8b339 fix: upgrade to go1.24.9 to fix CVEs 74502e5 Merge pull request #278 from liangyuanpeng/migrate_k8s_testimages 5334430 Merge pull request #281 from kubernetes-csi/dependabot/github_actions/actions/checkout-5 458ce14 Bump actions/checkout from 4 to 5 5f38a90 Merge pull request #282 from rhrmo/update-go-1.24.6 579f624 Update go to 1.24.6 5ec1a52 use gcr.io/k8s-staging-test-infra instead of gcr.io/k8s-testimages 74e066a Merge pull request #279 from Aishwarya-Hebbar/update-csi-prow-version 6f236be Update CSI prow driver version to v1.17.0 0ee5589 Merge pull request #280 from xing-yang/update_go_1.24.4 9af1015 update to go 1.24.4 f5fec3e Merge pull request #275 from chrishenzie/emeritus c5d285d Remove chrishenzie from kubernetes-csi-reviewers 0a435bf Merge pull request #274 from andyzhangx/patch-5 cd7b4bb Bump golang to 1.24.2 to fix CVE-2025-22871 701dc34 Merge pull request #273 from andyzhangx/patch-4 aeebd30 Bump golang to 1.24.0 f277d56 Merge pull request #270 from carlory/update-kind-version 90efb2c Merge pull request #272 from andyzhangx/patch-3 9b616fe Bump golang to 1.23.6 to fix CVE-2024-45336, CVE-2025-22866 6dcb96a update default kind version to v0.25.0 0496593 Merge pull request #268 from huww98/cloudbuild 119aee1 Merge pull request #266 from jsafrane/bump-sanity-5.3.1 0ae5e52 Update cloudbuild image with go 1.21+ 406a79a Merge pull request #267 from huww98/gomodcache 9cec273 Set GOMODCACHE to avoid re-download toolchain 98f2307 Merge pull request #260 from TerryHowe/update-csi-driver-version e9d8712 Merge pull request #259 from stmcginnis/deprecated-kind-kube-root faf79ff Remove --kube-root deprecated kind argument 734c2b9 Merge pull request #265 from Rakshith-R/consider-main-branch 43bde06 Bump csi-sanity to 5.3.1 f95c855 Merge pull request #262 from huww98/golang-toolchain 3c8d966 Treat main branch as equivalent to master branch e31de52 Merge pull request #261 from huww98/golang fd153a9 Bump golang to 1.23.1 a8b3d05 pull-test.sh: fix "git subtree pull" errors 6b05f0f use new GOTOOLCHAIN env to manage go version 18b6ac6 chore: update CSI driver version to 1.15 227577e Merge pull request #258 from gnufied/enable-race-detection e1ceee2 Always enable race detection while running tests 988496a Merge pull request #257 from jakobmoellerdev/csi-prow-sidecar-e2e-path 028f8c6 chore: bump to Go 1.22.5 69bd71e chore: add CSI_PROW_SIDECAR_E2E_PATH f40f0cc Merge pull request #256 from solumath/master cfa9210 Instruction update 379a1bb Merge pull request #255 from humblec/sidecar-md a5667bb fix typo in sidecar release process 4967685 Merge pull request #254 from bells17/add-github-actions d9bd160 Update skip list in codespell GitHub Action adb3af9 Merge pull request #252 from bells17/update-go-version f5aebfc Add GitHub Actions workflows b82ee38 Merge pull request #253 from bells17/fix-typo c317456 Fix typo 0a78505 Bump to Go 1.22.3 edd89ad Merge pull request #251 from jsafrane/add-logcheck 043fd09 Add test-logcheck target d7535ae Merge pull request #250 from jsafrane/go-1.22 b52e7ad Update go to 1.22.2 14fdb6f Merge pull request #247 from msau42/prow dc4d0ae Merge pull request #249 from jsafrane/use-go-version e681b17 Use .go-version to get Kubernetes go version 9b4352e Update release playbook c7bb972 Fix release notes script to use fixed tags 463a0e9 Add script to update specific go modules b54c1ba Merge pull request #246 from xing-yang/go_1.21 5436c81 Change go version to 1.21.5 267b40e Merge pull request #244 from carlory/sig-storage b42e5a2 nominate self (carlory) as kubernetes-csi reviewer a17f536 Merge pull request #210 from sunnylovestiramisu/sidecar 011033d Use set -x instead of die 5deaf66 Add wrapper script for sidecar release f8c8cc4 Merge pull request #237 from msau42/prow b36b5bf Merge pull request #240 from dannawang0221/upgrade-go-version adfddcc Merge pull request #243 from pohly/git-subtree-pull-fix c465088 pull-test.sh: avoid "git subtree pull" error 7b175a1 Update csi-test version to v5.2.0 987c90c Update go version to 1.21 to match k/k 2c625d4 Add script to generate patch release notes f9d5b9c Merge pull request #236 from mowangdk/feature/bump_csi-driver-host-path_version b01fd53 Bump csi-driver-host-path version up to v1.12.0 984feec Merge pull request #234 from siddhikhapare/csi-tools 1f7e605 fixed broken links of testgrid dashboard de2fba8 Merge pull request #233 from andyzhangx/andyzhangx-patch-1 cee895e remove windows 20H2 build since it's EOL long time ago 670bb0e Merge pull request #229 from marosset/fix-codespell-errors 35d5e78 Merge pull request #219 from yashsingh74/update-registry 63473cc Merge pull request #231 from coulof/bump-go-version-1.20.5 29a5c76 Merge pull request #228 from mowangdk/chore/adopt_kubernetes_recommand_labels 8dd2821 Update cloudbuild image with go 1.20.5 1df23db Merge pull request #230 from msau42/prow 1f92b7e Add ginkgo timeout to e2e tests to help catch any stuck tests 2b8b80e fixing some codespell errors c10b678 Merge pull request #227 from coulof/check-sidecar-supported-versions 72984ec chore: adopt kubernetes recommand label b055535 Header bd0a10b typo c39d73c Add comments f6491af Script to verify EOL sidecar version 4133d1d Merge pull request #226 from msau42/cloudbuild 8d519d2 Pin buildkit to v0.10.6 to workaround v0.11 bug with docker manifest 6e04a03 Merge pull request #224 from msau42/cloudbuild 26fdfff Update cloudbuild image 6613c39 Merge pull request #223 from sunnylovestiramisu/update 0e7ae99 Update k8s image repo url 77e47cc Merge pull request #222 from xinydev/fix-dep-version 155854b Fix dep version mismatch 8f83905 Merge pull request #221 from sunnylovestiramisu/go-update 1d3f94d Update go version to 1.20 to match k/k v1.27 e322ce5 Merge pull request #220 from andyzhangx/fix-golint-error b74a512 test: fix golint error 901bcb5 Update registry k8s.gcr.io -> registry.k8s.io aa61bfd Merge pull request #218 from xing-yang/update_csi_driver 7563d19 Update CSI_PROW_DRIVER_VERSION to v1.11.0 a2171be Merge pull request #216 from msau42/process cb98782 Merge pull request #217 from msau42/owners a11216e add new reviewers and remove inactive reviewers dd98675 Add step for checking builds b66c082 Merge pull request #214 from pohly/junit-fixes b9b6763 filter-junit.go: fix loss of testcases when parsing Ginkgo v2 JUnit d427783 filter-junit.go: preserve system error log 38e1146 prow.sh: publish individual JUnit files as separate artifacts git-subtree-dir: release-tools git-subtree-split: 058a31d3181dee31a4cd5de420108e6ce210d40e
This commit is contained in:
Nilesh Das
parent
c711349d1e
commit
7962d1e88c
|
|
@ -0,0 +1,12 @@
|
|||
version: 2
|
||||
enable-beta-ecosystems: true
|
||||
updates:
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
labels:
|
||||
- "area/dependency"
|
||||
- "release-note-none"
|
||||
- "ok-to-test"
|
||||
open-pull-requests-limit: 10
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
# GitHub Action to automate the identification of common misspellings in text files.
|
||||
# https://github.com/codespell-project/actions-codespell
|
||||
# https://github.com/codespell-project/codespell
|
||||
name: codespell
|
||||
on: [push, pull_request]
|
||||
jobs:
|
||||
codespell:
|
||||
name: Check for spelling errors
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
- uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2.2
|
||||
with:
|
||||
check_filenames: true
|
||||
skip: "*.png,*.jpg,*.svg,*.sum,./.git,./.github/workflows/codespell.yml,./prow.sh"
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
name: Run Trivy scanner for Go version vulnerabilities
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
schedule:
|
||||
- cron: '0 0 * * *' # Run daily at midnight UTC
|
||||
jobs:
|
||||
trivy:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
|
||||
- name: Get Go version
|
||||
id: go-version
|
||||
run: |
|
||||
GO_VERSION=$(cat prow.sh | grep "configvar CSI_PROW_GO_VERSION_BUILD" | awk '{print $3}' | sed 's/"//g')
|
||||
echo "version=$GO_VERSION" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Run Trivy scanner for Go version vulnerabilities
|
||||
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
|
||||
with:
|
||||
image-ref: 'golang:${{ steps.go-version.outputs.version }}'
|
||||
format: 'table'
|
||||
exit-code: '1'
|
||||
ignore-unfixed: true
|
||||
vuln-type: 'library'
|
||||
severity: 'CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN'
|
||||
|
|
@ -8,6 +8,7 @@ aliases:
|
|||
- jsafrane
|
||||
- msau42
|
||||
- saad-ali
|
||||
- gnufied
|
||||
- xing-yang
|
||||
|
||||
# Reviewers are automatically assigned to new PRs. The following
|
||||
|
|
@ -18,21 +19,23 @@ aliases:
|
|||
# when they are temporarily unable to review PRs.
|
||||
kubernetes-csi-reviewers:
|
||||
- andyzhangx
|
||||
- chrishenzie
|
||||
- carlory
|
||||
- ggriffiths
|
||||
- gnufied
|
||||
- humblec
|
||||
- mauriciopoppe
|
||||
- j-griffith
|
||||
- Jiawei0227
|
||||
- jingxu97
|
||||
- jsafrane
|
||||
- pohly
|
||||
- RaunakShah
|
||||
- sunnylovestiramisu
|
||||
- xing-yang
|
||||
|
||||
# This documents who previously contributed to Kubernetes-CSI
|
||||
# as approver.
|
||||
emeritus_approvers:
|
||||
- Jiawei0227
|
||||
- lpabon
|
||||
- sbezverk
|
||||
- vladimirvivien
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ The release manager must:
|
|||
Whenever a new Kubernetes minor version is released, our kubernetes-csi CI jobs
|
||||
must be updated.
|
||||
|
||||
[Our CI jobs](https://k8s-testgrid.appspot.com/sig-storage-csi-ci) have the
|
||||
[Our CI jobs](https://testgrid.k8s.io/sig-storage-csi-ci) have the
|
||||
naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
||||
|
||||
1. Jobs should be actively monitored to find and fix failures in sidecars and
|
||||
|
|
@ -46,52 +46,51 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
|||
## Release Process
|
||||
1. Identify all issues and ongoing PRs that should go into the release, and
|
||||
drive them to resolution.
|
||||
1. Download the latest version of the
|
||||
[K8s release notes generator](https://github.com/kubernetes/release/tree/HEAD/cmd/release-notes)
|
||||
1. Create a
|
||||
[Github personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
|
||||
with `repo:public_repo` access
|
||||
1. Generate release notes for the release. Replace arguments with the relevant
|
||||
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:
|
||||
```bash
|
||||
GITHUB_TOKEN=<token> release-notes \
|
||||
--discover=mergebase-to-latest \
|
||||
--org=kubernetes-csi \
|
||||
--repo=external-provisioner \
|
||||
--required-author="" \
|
||||
--markdown-links \
|
||||
--output out.md
|
||||
```
|
||||
* For new patch releases on a release branch:
|
||||
```bash
|
||||
GITHUB_TOKEN=<token> release-notes \
|
||||
--discover=patch-to-latest \
|
||||
--branch=release-1.1 \
|
||||
--org=kubernetes-csi \
|
||||
--repo=external-provisioner \
|
||||
--required-author="" \
|
||||
--markdown-links \
|
||||
--output out.md
|
||||
```
|
||||
1. Compare the generated output to the new commits for the release to check if
|
||||
any notable change missed a release note.
|
||||
1. Reword release notes as needed. Make sure to check notes for breaking
|
||||
changes and deprecations.
|
||||
1. If release is a new major/minor version, create a new `CHANGELOG-<major>.<minor>.md`
|
||||
file. Otherwise, add the release notes to the top of the existing CHANGELOG
|
||||
file for that minor version.
|
||||
1. Submit a PR for the CHANGELOG changes.
|
||||
1. Update dependencies for sidecars
|
||||
1. For new minor versions, use
|
||||
[go-modules-update.sh](https://github.com/kubernetes-csi/csi-release-tools/blob/HEAD/go-modules-update.sh),
|
||||
1. For CVE fixes on patch versions, use
|
||||
[go-modules-targeted-update.sh](https://github.com/kubernetes-csi/csi-release-tools/blob/HEAD/go-modules-targeted-update.sh),
|
||||
Read the instructions at the top of the script.
|
||||
1. Check that all [canary CI
|
||||
jobs](https://testgrid.k8s.io/sig-storage-csi-ci) are passing,
|
||||
and that test coverage is adequate for the changes that are going into the release.
|
||||
1. Check that the post-\<sidecar\>-push-images builds are succeeding.
|
||||
[Example](https://testgrid.k8s.io/sig-storage-image-build#post-external-snapshotter-push-images)
|
||||
1. Generate release notes.
|
||||
1. Download the latest version of the [K8s release notes generator](https://github.com/kubernetes/release/tree/HEAD/cmd/release-notes)
|
||||
1. Create a
|
||||
[Github personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
|
||||
with `repo:public_repo` access
|
||||
1. For patch release, use the script generate_patch_release_notes.sh. Read the instructions at the top of the
|
||||
script. The script also creates PRs for each branch.
|
||||
1. For new minor releases, follow these steps and replace arguments with the relevant
|
||||
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:
|
||||
```bash
|
||||
GITHUB_TOKEN=<token> release-notes \
|
||||
--discover=mergebase-to-latest \
|
||||
--org=kubernetes-csi \
|
||||
--repo=external-provisioner \
|
||||
--required-author="" \
|
||||
--markdown-links \
|
||||
--output out.md
|
||||
```
|
||||
1. Compare the generated output to the new commits for the release to check if
|
||||
any notable change missed a release note.
|
||||
1. Reword release notes as needed, ideally in the original PRs so that the
|
||||
release notes can be regenerated. Make sure to check notes for breaking
|
||||
changes and deprecations.
|
||||
1. If release is a new major/minor version, create a new `CHANGELOG-<major>.<minor>.md`
|
||||
file.
|
||||
1. Submit a PR for the CHANGELOG changes.
|
||||
1. Submit a PR for README changes, in particular, Compatibility, Feature status,
|
||||
and any other sections that may need updating.
|
||||
1. Check that all [canary CI
|
||||
jobs](https://k8s-testgrid.appspot.com/sig-storage-csi-ci) are passing,
|
||||
and that test coverage is adequate for the changes that are going into the release.
|
||||
1. Make sure that no new PRs have merged in the meantime, and no PRs are in
|
||||
flight and soon to be merged.
|
||||
1. Create a new release following a previous release as a template. Be sure to select the correct
|
||||
|
|
@ -99,10 +98,10 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
|||
[external-provisioner example](https://github.com/kubernetes-csi/external-provisioner/releases/new)
|
||||
1. If release was a new major/minor version, create a new `release-<minor>`
|
||||
branch at that commit.
|
||||
1. Check [image build status](https://k8s-testgrid.appspot.com/sig-storage-image-build).
|
||||
1. Promote images from k8s-staging-sig-storage to k8s.gcr.io/sig-storage. From
|
||||
1. Check [image build status](https://testgrid.k8s.io/sig-storage-image-build).
|
||||
1. Promote images from k8s-staging-sig-storage to registry.k8s.io/sig-storage. From
|
||||
the [k8s image
|
||||
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage),
|
||||
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage),
|
||||
run `./generate.sh > images.yaml`, and send a PR with the updated images.
|
||||
Once merged, the image promoter will copy the images from staging to prod.
|
||||
1. Update [kubernetes-csi/docs](https://github.com/kubernetes-csi/docs) sidecar
|
||||
|
|
@ -118,7 +117,7 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
|||
|
||||
The following jobs are triggered after tagging to produce the corresponding
|
||||
image(s):
|
||||
https://k8s-testgrid.appspot.com/sig-storage-image-build
|
||||
https://testgrid.k8s.io/sig-storage-image-build
|
||||
|
||||
Clicking on a failed build job opens that job in https://prow.k8s.io. Next to
|
||||
the job title is a rerun icon (circle with arrow). Clicking it opens a popup
|
||||
|
|
|
|||
22
build.make
22
build.make
|
|
@ -45,9 +45,10 @@ REV=$(shell git describe --long --tags --match='v*' --dirty 2>/dev/null || git r
|
|||
# Determined dynamically.
|
||||
IMAGE_TAGS=
|
||||
|
||||
# A "canary" image gets built if the current commit is the head of the remote "master" branch.
|
||||
# A "canary" image gets built if the current commit is the head of the remote "master" or "main" branch.
|
||||
# That branch does not exist when building some other branch in TravisCI.
|
||||
IMAGE_TAGS+=$(shell if [ "$$(git rev-list -n1 HEAD)" = "$$(git rev-list -n1 origin/master 2>/dev/null)" ]; then echo "canary"; fi)
|
||||
IMAGE_TAGS+=$(shell if [ "$$(git rev-list -n1 HEAD)" = "$$(git rev-list -n1 origin/main 2>/dev/null)" ]; then echo "canary"; fi)
|
||||
|
||||
# A "X.Y.Z-canary" image gets built if the current commit is the head of a "origin/release-X.Y.Z" branch.
|
||||
# The actual suffix does not matter, only the "release-" prefix is checked.
|
||||
|
|
@ -62,9 +63,9 @@ IMAGE_NAME=$(REGISTRY_NAME)/$*
|
|||
|
||||
ifdef V
|
||||
# Adding "-alsologtostderr" assumes that all test binaries contain glog. This is not guaranteed.
|
||||
TESTARGS = -v -args -alsologtostderr -v 5
|
||||
TESTARGS = -race -v -args -alsologtostderr -v 5
|
||||
else
|
||||
TESTARGS =
|
||||
TESTARGS = -race
|
||||
endif
|
||||
|
||||
# Specific packages can be excluded from each of the tests below by setting the *_FILTER_CMD variables
|
||||
|
|
@ -143,12 +144,12 @@ DOCKER_BUILDX_CREATE_ARGS ?=
|
|||
# Windows binaries can be built before adding a Dockerfile for it.
|
||||
#
|
||||
# BUILD_PLATFORMS determines which individual images are included in the multiarch image.
|
||||
# PULL_BASE_REF must be set to 'master', 'release-x.y', or a tag name, and determines
|
||||
# PULL_BASE_REF must be set to 'master', 'main', 'release-x.y', or a tag name, and determines
|
||||
# the tag for the resulting multiarch image.
|
||||
$(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
|
||||
set -ex; \
|
||||
export DOCKER_CLI_EXPERIMENTAL=enabled; \
|
||||
docker buildx create $(DOCKER_BUILDX_CREATE_ARGS) --use --name multiarchimage-buildertest; \
|
||||
docker buildx create $(DOCKER_BUILDX_CREATE_ARGS) --use --name multiarchimage-buildertest --driver-opt image=moby/buildkit:v0.10.6; \
|
||||
trap "docker buildx rm multiarchimage-buildertest" EXIT; \
|
||||
dockerfile_linux=$$(if [ -e ./$(CMDS_DIR)/$*/Dockerfile ]; then echo ./$(CMDS_DIR)/$*/Dockerfile; else echo Dockerfile; fi); \
|
||||
dockerfile_windows=$$(if [ -e ./$(CMDS_DIR)/$*/Dockerfile.Windows ]; then echo ./$(CMDS_DIR)/$*/Dockerfile.Windows; else echo Dockerfile.Windows; fi); \
|
||||
|
|
@ -191,7 +192,7 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
|
|||
done; \
|
||||
docker manifest push -p $(IMAGE_NAME):$$tag; \
|
||||
}; \
|
||||
if [ $(PULL_BASE_REF) = "master" ]; then \
|
||||
if [ $(PULL_BASE_REF) = "master" ] || [ $(PULL_BASE_REF) = "main" ]; then \
|
||||
: "creating or overwriting canary image"; \
|
||||
pushMultiArch canary; \
|
||||
elif echo $(PULL_BASE_REF) | grep -q -e 'release-*' ; then \
|
||||
|
|
@ -209,7 +210,7 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
|
|||
.PHONY: check-pull-base-ref
|
||||
check-pull-base-ref:
|
||||
if ! [ "$(PULL_BASE_REF)" ]; then \
|
||||
echo >&2 "ERROR: PULL_BASE_REF must be set to 'master', 'release-x.y', or a tag name."; \
|
||||
echo >&2 "ERROR: PULL_BASE_REF must be set to 'master', 'main', 'release-x.y', or a tag name."; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
|
|
@ -322,3 +323,10 @@ test-spelling:
|
|||
test-boilerplate:
|
||||
@ echo; echo "### $@:"
|
||||
@ ./release-tools/verify-boilerplate.sh "$(pwd)"
|
||||
|
||||
# Test klog usage. This test is optional and must be explicitly added to `test` target in the main Makefile:
|
||||
# test: test-logcheck
|
||||
.PHONY: test-logcheck
|
||||
test-logcheck:
|
||||
@ echo; echo "### $@:"
|
||||
@ ./release-tools/verify-logcheck.sh
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# See https://github.com/kubernetes/test-infra/blob/HEAD/config/jobs/image-pushing/README.md
|
||||
# for more details on image pushing process in Kubernetes.
|
||||
#
|
||||
# To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage.
|
||||
# To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage.
|
||||
|
||||
# This must be specified in seconds. If omitted, defaults to 600s (10 mins).
|
||||
# Building three images in external-snapshotter takes more than an hour.
|
||||
|
|
@ -26,7 +26,7 @@ steps:
|
|||
# The image must contain bash and curl. Ideally it should also contain
|
||||
# the desired version of Go (currently defined in release-tools/prow.sh),
|
||||
# but that just speeds up the build and is not required.
|
||||
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
|
||||
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20260205-38cfa9523f'
|
||||
entrypoint: ./.cloudbuild.sh
|
||||
env:
|
||||
- GIT_TAG=${_GIT_TAG}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,170 @@
|
|||
# Copyright 2023 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import argparse
|
||||
import datetime
|
||||
import re
|
||||
from collections import defaultdict
|
||||
import subprocess
|
||||
import shutil
|
||||
from dateutil.relativedelta import relativedelta
|
||||
|
||||
def check_gh_command():
|
||||
"""
|
||||
Pretty much everything is processed from `gh`
|
||||
Check that the `gh` command is in the path before anything else
|
||||
"""
|
||||
if not shutil.which('gh'):
|
||||
print("Error: The `gh` command is not available in the PATH.")
|
||||
print("Please install the GitHub CLI (https://cli.github.com/) and try again.")
|
||||
exit(1)
|
||||
|
||||
def duration_ago(dt):
|
||||
"""
|
||||
Humanize duration outputs
|
||||
"""
|
||||
delta = relativedelta(datetime.datetime.now(), dt)
|
||||
if delta.years > 0:
|
||||
return f"{delta.years} year{'s' if delta.years > 1 else ''} ago"
|
||||
elif delta.months > 0:
|
||||
return f"{delta.months} month{'s' if delta.months > 1 else ''} ago"
|
||||
elif delta.days > 0:
|
||||
return f"{delta.days} day{'s' if delta.days > 1 else ''} ago"
|
||||
elif delta.hours > 0:
|
||||
return f"{delta.hours} hour{'s' if delta.hours > 1 else ''} ago"
|
||||
elif delta.minutes > 0:
|
||||
return f"{delta.minutes} minute{'s' if delta.minutes > 1 else ''} ago"
|
||||
else:
|
||||
return "just now"
|
||||
|
||||
def parse_version(version):
|
||||
"""
|
||||
Parse version assuming it is in the form of v1.2.3
|
||||
"""
|
||||
pattern = r"v(\d+)\.(\d+)\.(\d+)"
|
||||
match = re.match(pattern, version)
|
||||
if match:
|
||||
major, minor, patch = map(int, match.groups())
|
||||
return (major, minor, patch)
|
||||
|
||||
def end_of_life_grouped_versions(versions):
|
||||
"""
|
||||
Calculate the end of life date for a minor release version according to : https://kubernetes-csi.github.io/docs/project-policies.html#support
|
||||
|
||||
The input is an array of tuples of:
|
||||
* grouped versions (e.g. 1.0, 1.1)
|
||||
* array of that contains all versions and their release date (e.g. 1.0.0, 01-01-2013)
|
||||
|
||||
versions structure example :
|
||||
[((3, 5), [('v3.5.0', datetime.datetime(2023, 4, 27, 22, 28, 6))]),
|
||||
((3, 4),
|
||||
[('v3.4.1', datetime.datetime(2023, 4, 5, 17, 41, 15)),
|
||||
('v3.4.0', datetime.datetime(2022, 12, 27, 23, 43, 41))])]
|
||||
"""
|
||||
supported_versions = []
|
||||
# Prepare dates for later calculation
|
||||
now = datetime.datetime.now()
|
||||
one_year = datetime.timedelta(days=365)
|
||||
three_months = datetime.timedelta(days=90)
|
||||
|
||||
# get the newer versions on top
|
||||
sorted_versions_list = sorted(versions.items(), key=lambda x: x[0], reverse=True)
|
||||
|
||||
# the latest version is always supported no matter the release date
|
||||
latest = sorted_versions_list.pop(0)
|
||||
supported_versions.append(latest[1][-1])
|
||||
|
||||
for v in sorted_versions_list:
|
||||
first_release = v[1][-1]
|
||||
last_release = v[1][0]
|
||||
# if the release is less than a year old we support the latest patch version
|
||||
if now - first_release[1] < one_year:
|
||||
supported_versions.append(last_release)
|
||||
# if the main release is older than a year and has a recent path, this is supported
|
||||
elif now - last_release[1] < three_months:
|
||||
supported_versions.append(last_release)
|
||||
return supported_versions
|
||||
|
||||
def get_release_docker_image(repo, version):
|
||||
"""
|
||||
Extract docker image name from the release page documentation
|
||||
"""
|
||||
output = subprocess.check_output(['gh', 'release', '-R', repo, 'view', version], text=True)
|
||||
#Extract matching image name excluding `
|
||||
match = re.search(r"docker pull ([\.\/\-\:\w\d]*)", output)
|
||||
docker_image = match.group(1) if match else ''
|
||||
return((version, docker_image))
|
||||
|
||||
def get_versions_from_releases(repo):
|
||||
"""
|
||||
Using `gh` cli get the github releases page details then
|
||||
create a list of grouped version on major.minor
|
||||
and for each give all major.minor.patch with release dates
|
||||
"""
|
||||
# Run the `gh release` command to get the release list
|
||||
output = subprocess.check_output(['gh', 'release', '-R', repo, 'list'], text=True)
|
||||
# Parse the output and group by major and minor version numbers
|
||||
versions = defaultdict(lambda: [])
|
||||
for line in output.strip().split('\n'):
|
||||
parts = line.split('\t')
|
||||
# pprint.pprint(parts)
|
||||
version = parts[0]
|
||||
parsed_version = parse_version(version)
|
||||
if parsed_version is None:
|
||||
continue
|
||||
major, minor, patch = parsed_version
|
||||
|
||||
published = datetime.datetime.strptime(parts[3], '%Y-%m-%dT%H:%M:%SZ')
|
||||
versions[(major, minor)].append((version, published))
|
||||
return(versions)
|
||||
|
||||
|
||||
def main():
|
||||
manual = """
|
||||
This script lists the supported versions Github releases according to https://kubernetes-csi.github.io/docs/project-policies.html#support
|
||||
It has been designed to help to update the tables from : https://kubernetes-csi.github.io/docs/sidecar-containers.html\n\n
|
||||
It can take multiple repos as argument, for all CSI sidecars details you can run:
|
||||
./get_supported_version_csi-sidecar.py -R kubernetes-csi/external-attacher -R kubernetes-csi/external-provisioner -R kubernetes-csi/external-resizer -R kubernetes-csi/external-snapshotter -R kubernetes-csi/livenessprobe -R kubernetes-csi/node-driver-registrar -R kubernetes-csi/external-health-monitor\n
|
||||
With the output you can then update the documentation manually.
|
||||
"""
|
||||
parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, description=manual)
|
||||
parser.add_argument('--repo', '-R', required=True, action='append', dest='repos', help='The name of the repository in the format owner/repo.')
|
||||
parser.add_argument('--display', '-d', action='store_true', help='(default) Display EOL versions with their dates', default=True)
|
||||
parser.add_argument('--doc', '-D', action='store_true', help='Helper to https://kubernetes-csi.github.io/docs/ that prints Docker image for each EOL version')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
# Verify pre-reqs
|
||||
check_gh_command()
|
||||
|
||||
# Process all repos
|
||||
for repo in args.repos:
|
||||
versions = get_versions_from_releases(repo)
|
||||
eol_versions = end_of_life_grouped_versions(versions)
|
||||
|
||||
if args.display:
|
||||
print(f"Supported versions with release date and age of `{repo}`:\n")
|
||||
for version in eol_versions:
|
||||
print(f"{version[0]}\t{version[1].strftime('%Y-%m-%d')}\t{duration_ago(version[1])}")
|
||||
|
||||
# TODO : generate proper doc output for the tables of: https://kubernetes-csi.github.io/docs/sidecar-containers.html
|
||||
if args.doc:
|
||||
print("\nSupported Versions with docker images for each end of life version:\n")
|
||||
for version in eol_versions:
|
||||
_, image = get_release_docker_image(repo, version[0])
|
||||
print(f"{version[0]}\t{image}")
|
||||
print()
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
@ -24,7 +24,6 @@ package main
|
|||
import (
|
||||
"encoding/xml"
|
||||
"flag"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"regexp"
|
||||
)
|
||||
|
|
@ -56,6 +55,7 @@ type TestCase struct {
|
|||
Name string `xml:"name,attr"`
|
||||
Time string `xml:"time,attr"`
|
||||
SystemOut string `xml:"system-out,omitempty"`
|
||||
SystemErr string `xml:"system-err,omitempty"`
|
||||
Failure string `xml:"failure,omitempty"`
|
||||
Skipped SkipReason `xml:"skipped,omitempty"`
|
||||
}
|
||||
|
|
@ -95,7 +95,7 @@ func main() {
|
|||
}
|
||||
} else {
|
||||
var err error
|
||||
data, err = ioutil.ReadFile(input)
|
||||
data, err = os.ReadFile(input)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
|
@ -109,7 +109,7 @@ func main() {
|
|||
if err := xml.Unmarshal(data, &junitv2); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
junit = junitv2.TestSuite
|
||||
junit.TestCases = append(junit.TestCases, junitv2.TestSuite.TestCases...)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,7 +142,7 @@ func main() {
|
|||
panic(err)
|
||||
}
|
||||
} else {
|
||||
if err := ioutil.WriteFile(*output, data, 0644); err != nil {
|
||||
if err := os.WriteFile(*output, data, 0644); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,114 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2023 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
# Usage: generate_patch_release_notes.sh
|
||||
#
|
||||
# Generates and creates PRs for kubernetes-csi patch releases.
|
||||
#
|
||||
# Required environment variables
|
||||
# CSI_RELEASE_TOKEN: Github token needed for generating release notes
|
||||
# GITHUB_USER: Github username to create PRs with
|
||||
#
|
||||
# Required tools:
|
||||
# - gh
|
||||
# - release-notes (https://github.com/kubernetes/release/blob/master/cmd/release-notes/README.md)
|
||||
#
|
||||
# Instructions:
|
||||
# 1. Install the required tools
|
||||
# 2. Login with "gh auth login"
|
||||
# 3. Copy this script to the kubernetes-csi directory (one directory above the repos)
|
||||
# 4. Update the repos and versions in the $releases array
|
||||
# 5. Set environment variables
|
||||
# 6. Run script from the kubernetes-csi directory
|
||||
#
|
||||
# Caveats:
|
||||
# - This script doesn't handle regenerating and updating existing PRs yet.
|
||||
# It might work if you comment out the PR creation line
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
releases=(
|
||||
# "external-attacher 4.4.1"
|
||||
# "external-provisioner 3.6.1"
|
||||
# "external-snapshotter 6.2.3"
|
||||
)
|
||||
|
||||
function gen_patch_relnotes() {
|
||||
rm out.md || true
|
||||
rm -rf /tmp/k8s-repo || true
|
||||
GITHUB_TOKEN="$CSI_RELEASE_TOKEN" \
|
||||
release-notes --start-rev="$3" --end-rev="$2" --branch="$2" \
|
||||
--org=kubernetes-csi --repo="$1" \
|
||||
--required-author="" --markdown-links --output out.md
|
||||
}
|
||||
|
||||
for rel in "${releases[@]}"; do
|
||||
read -r repo version <<< "$rel"
|
||||
|
||||
# Parse minor version
|
||||
minorPatchPattern="(^[[:digit:]]+\.[[:digit:]]+)\.([[:digit:]]+)"
|
||||
[[ "$version" =~ $minorPatchPattern ]]
|
||||
minor="${BASH_REMATCH[1]}"
|
||||
patch="${BASH_REMATCH[2]}"
|
||||
|
||||
echo "$repo $version $minor $patch"
|
||||
prevPatch="$((patch-1))"
|
||||
prevVer="v$minor.$prevPatch"
|
||||
|
||||
pushd "$repo/CHANGELOG"
|
||||
|
||||
git fetch upstream
|
||||
|
||||
# Create branch
|
||||
branch="changelog-release-$minor"
|
||||
git checkout master
|
||||
git branch -D "$branch" || true
|
||||
git checkout --track "upstream/release-$minor" -b "$branch"
|
||||
|
||||
# Generate release notes
|
||||
gen_patch_relnotes "$repo" "release-$minor" "$prevVer"
|
||||
cat > tmp.md <<EOF
|
||||
# Release notes for v$version
|
||||
|
||||
[Documentation](https://kubernetes-csi.github.io)
|
||||
|
||||
EOF
|
||||
|
||||
cat out.md >> tmp.md
|
||||
echo >> tmp.md
|
||||
rm out.md
|
||||
|
||||
file="CHANGELOG-$minor.md"
|
||||
cat "$file" >> tmp.md
|
||||
mv tmp.md "$file"
|
||||
|
||||
git add -u
|
||||
git commit -m "Add changelog for $version"
|
||||
git push -f origin "$branch"
|
||||
|
||||
# Create PR
|
||||
prbody=$(cat <<EOF
|
||||
\`\`\`release-note
|
||||
NONE
|
||||
\`\`\`
|
||||
EOF
|
||||
)
|
||||
gh pr create --title="Changelog for v$version" --body "$prbody" --head "$GITHUB_USER:$branch" --base "release-$minor" --repo="kubernetes-csi/$repo"
|
||||
|
||||
popd
|
||||
done
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2023 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
# Usage: go-modules-targeted-update.sh
|
||||
#
|
||||
# Batch update specific dependencies for sidecars.
|
||||
#
|
||||
# Required environment variables
|
||||
# CSI_RELEASE_TOKEN: Github token needed for generating release notes
|
||||
# GITHUB_USER: Github username to create PRs with
|
||||
#
|
||||
# Instructions:
|
||||
# 1. Login with "gh auth login"
|
||||
# 2. Copy this script to the Github org directory (one directory above the
|
||||
# repos)
|
||||
# 3. Change $modules, $releases and $org if needed.
|
||||
# 4. Set environment variables
|
||||
# 5. Run script from the Github org directory
|
||||
#
|
||||
# Caveats:
|
||||
# - This script doesn't handle interface incompatibility of updates.
|
||||
# You need to resolve interface incompatibility case by case. The
|
||||
# most frequent case is to update the interface(new parameters,
|
||||
# name change of the method, etc.)in the sidecar repo and make sure
|
||||
# the build and test pass.
|
||||
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
org="kubernetes-csi"
|
||||
|
||||
modules=(
|
||||
"github.com/kubernetes-csi/csi-lib-utils@v0.15.1"
|
||||
)
|
||||
|
||||
releases=(
|
||||
#"external-attacher release-4.4"
|
||||
#"external-provisioner release-3.6"
|
||||
#"external-resizer release-1.9"
|
||||
#"external-snapshotter release-6.3"
|
||||
#"node-driver-registrar release-2.9"
|
||||
)
|
||||
|
||||
for rel in "${releases[@]}"; do
|
||||
|
||||
read -r repo branch <<< "$rel"
|
||||
if [ "$repo" != "#" ]; then
|
||||
(
|
||||
cd "$repo"
|
||||
git fetch upstream
|
||||
|
||||
if [ "$(git rev-parse --verify "module-update-$branch" 2>/dev/null)" ]; then
|
||||
git checkout master && git branch -D "module-update-$branch"
|
||||
fi
|
||||
git checkout -B "module-update-$branch" "upstream/$branch"
|
||||
|
||||
for mod in "${modules[@]}"; do
|
||||
go get "$mod"
|
||||
done
|
||||
go mod tidy
|
||||
go mod vendor
|
||||
|
||||
git add --all
|
||||
git commit -m "Update go modules"
|
||||
git push origin "module-update-$branch" --force
|
||||
|
||||
# Create PR
|
||||
prbody=$(cat <<EOF
|
||||
Updated the following go modules:
|
||||
|
||||
${modules[@]}
|
||||
|
||||
\`\`\`release-note
|
||||
NONE
|
||||
\`\`\`
|
||||
EOF
|
||||
)
|
||||
gh pr create --title="[$branch] Update go modules" --body "$prbody" --head "$GITHUB_USER:module-update-$branch" --base "$branch" --repo="$org/$repo"
|
||||
)
|
||||
fi
|
||||
done
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2023 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
# Usage: go-modules-update.sh
|
||||
#
|
||||
# Batch update dependencies for sidecars.
|
||||
#
|
||||
# Required environment variables
|
||||
# CSI_RELEASE_TOKEN: Github token needed for generating release notes
|
||||
# GITHUB_USER: Github username to create PRs with
|
||||
#
|
||||
# Instructions:
|
||||
# 1. Login with "gh auth login"
|
||||
# 2. Copy this script to the kubernetes-csi directory (one directory above the
|
||||
# repos)
|
||||
# 3. Update the repos and master branch so locally it has the latest upstream
|
||||
# change
|
||||
# 4. Set environment variables
|
||||
# 5. Run script from the kubernetes-csi directory
|
||||
#
|
||||
# Caveats:
|
||||
# - This script doesn't handle interface incompatibility of updates.
|
||||
# You need to resolve interface incompatibility case by case. The
|
||||
# most frequent case is to update the interface(new parameters,
|
||||
# name change of the method, etc.)in the sidecar repo and make sure
|
||||
# the build and test pass.
|
||||
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
MAX_RETRY=10
|
||||
|
||||
# Get the options
|
||||
while getopts ":u:v:" option; do
|
||||
case $option in
|
||||
u) # Set username
|
||||
username=$OPTARG;;
|
||||
v) # Set version
|
||||
v=$OPTARG;;
|
||||
\?) # Invalid option
|
||||
echo "Error: Invalid option: $OPTARG"
|
||||
exit;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Only need to do this once
|
||||
gh auth login
|
||||
|
||||
while read -r repo branches; do
|
||||
if [ "$repo" != "#" ]; then
|
||||
(
|
||||
cd "$repo"
|
||||
git fetch origin
|
||||
for i in $branches; do
|
||||
if [ "$(git rev-parse --verify "module-update-$i" 2>/dev/null)" ]; then
|
||||
git checkout master && git branch -d "module-update-$i"
|
||||
fi
|
||||
git checkout -B "module-update-$i" "origin/$i"
|
||||
rm -rf .git/MERGE*
|
||||
if ! git subtree pull --squash --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master; then
|
||||
# Sometimes "--squash" leads to merge conflicts. Because we know that "release-tools"
|
||||
# is an unmodified copy of csi-release-tools, we can automatically resolve that
|
||||
# by replacing it completely.
|
||||
if [ -e .git/MERGE_MSG ] && [ -e .git/FETCH_HEAD ] && grep -q "^# Conflict" .git/MERGE_MSG; then
|
||||
rm -rf release-tools
|
||||
mkdir release-tools
|
||||
git archive FETCH_HEAD | tar -C release-tools -xf -
|
||||
git add release-tools
|
||||
git commit --file=.git/MERGE_MSG
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
RETRY=0
|
||||
while ! ./release-tools/go-get-kubernetes.sh -p "$v" && RETRY < $MAX_RETRY
|
||||
do
|
||||
RETRY=$((RETRY+1))
|
||||
go mod tidy && go mod vendor && go mod tidy
|
||||
done
|
||||
go mod tidy && go mod vendor && go mod tidy
|
||||
git add --all
|
||||
git commit -m "Update dependency go modules for k8s v$v"
|
||||
git remote set-url origin "https://github.com/$username/$repo.git"
|
||||
make test
|
||||
git push origin "module-update-$i" --force
|
||||
# Create PR
|
||||
prbody=$(cat <<EOF
|
||||
Ran kubernetes-csi/csi-release-tools go-get-kubernetes.sh -p ${v}.
|
||||
|
||||
|
||||
\`\`\`release-note
|
||||
Update kubernetes dependencies to v${v}
|
||||
\`\`\`
|
||||
EOF
|
||||
)
|
||||
gh pr create --title="Update dependency go modules for k8s v$v" --body "$prbody" --head "$username:module-update-master" --base "master" --repo="kubernetes-csi/$repo"
|
||||
done
|
||||
)
|
||||
fi
|
||||
done <<EOF
|
||||
csi-driver-host-path master
|
||||
csi-driver-iscsi master
|
||||
csi-driver-nfs master
|
||||
csi-lib-utils master
|
||||
csi-proxy master
|
||||
csi-test master
|
||||
external-attacher master
|
||||
external-health-monitor master
|
||||
external-provisioner master
|
||||
external-resizer master
|
||||
external-snapshotter master
|
||||
livenessprobe master
|
||||
node-driver-registrar master
|
||||
EOF
|
||||
106
prow.sh
106
prow.sh
|
|
@ -78,7 +78,7 @@ version_to_git () {
|
|||
# the list of windows versions was matched from:
|
||||
# - https://hub.docker.com/_/microsoft-windows-nanoserver
|
||||
# - https://hub.docker.com/_/microsoft-windows-servercore
|
||||
configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -ppc64le; linux s390x s390x -s390x; linux arm arm -arm; linux arm64 arm64 -arm64; linux arm arm/v7 -armv7; windows amd64 amd64 .exe nanoserver:1809 servercore:ltsc2019; windows amd64 amd64 .exe nanoserver:20H2 servercore:20H2; windows amd64 amd64 .exe nanoserver:ltsc2022 servercore:ltsc2022" "Go target platforms (= GOOS + GOARCH) and file suffix of the resulting binaries"
|
||||
configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -ppc64le; linux s390x s390x -s390x; linux arm arm -arm; linux arm64 arm64 -arm64; linux arm arm/v7 -armv7; windows amd64 amd64 .exe nanoserver:1809 servercore:ltsc2019; windows amd64 amd64 .exe nanoserver:ltsc2022 servercore:ltsc2022" "Go target platforms (= GOOS + GOARCH) and file suffix of the resulting binaries"
|
||||
|
||||
# If we have a vendor directory, then use it. We must be careful to only
|
||||
# use this for "make" invocations inside the project's repo itself because
|
||||
|
|
@ -86,7 +86,7 @@ configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -pp
|
|||
# which is disabled with GOFLAGS=-mod=vendor).
|
||||
configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory"
|
||||
|
||||
configvar CSI_PROW_GO_VERSION_BUILD "1.19" "Go version for building the component" # depends on component's source code
|
||||
configvar CSI_PROW_GO_VERSION_BUILD "1.25.9" "Go version for building the component" # depends on component's source code
|
||||
configvar CSI_PROW_GO_VERSION_E2E "" "override Go version for building the Kubernetes E2E test suite" # normally doesn't need to be set, see install_e2e
|
||||
configvar CSI_PROW_GO_VERSION_SANITY "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building the csi-sanity test suite" # depends on CSI_PROW_SANITY settings below
|
||||
configvar CSI_PROW_GO_VERSION_KIND "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building 'kind'" # depends on CSI_PROW_KIND_VERSION below
|
||||
|
|
@ -101,7 +101,10 @@ configvar CSI_PROW_GINKGO_VERSION v1.7.0 "Ginkgo"
|
|||
|
||||
# Ginkgo runs the E2E test in parallel. The default is based on the number
|
||||
# of CPUs, but typically this can be set to something higher in the job.
|
||||
configvar CSI_PROW_GINKO_PARALLEL "-p" "Ginko parallelism parameter(s)"
|
||||
configvar CSI_PROW_GINKGO_PARALLEL "-p" "Ginkgo parallelism parameter(s)"
|
||||
|
||||
# Timeout value for the overall ginkgo test suite.
|
||||
configvar CSI_PROW_GINKGO_TIMEOUT "1h" "Ginkgo timeout"
|
||||
|
||||
# Enables building the code in the repository. On by default, can be
|
||||
# disabled in jobs which only use pre-built components.
|
||||
|
|
@ -121,7 +124,7 @@ configvar CSI_PROW_BUILD_JOB true "building code in repo enabled"
|
|||
# use the same settings as for "latest" Kubernetes. This works
|
||||
# as long as there are no breaking changes in Kubernetes, like
|
||||
# deprecating or changing the implementation of an alpha feature.
|
||||
configvar CSI_PROW_KUBERNETES_VERSION 1.22.0 "Kubernetes"
|
||||
configvar CSI_PROW_KUBERNETES_VERSION 1.34.0 "Kubernetes"
|
||||
|
||||
# CSI_PROW_KUBERNETES_VERSION reduced to first two version numbers and
|
||||
# with underscore (1_13 instead of 1.13.3) and in uppercase (LATEST
|
||||
|
|
@ -141,7 +144,7 @@ kind_version_default () {
|
|||
latest|master)
|
||||
echo main;;
|
||||
*)
|
||||
echo v0.14.0;;
|
||||
echo v0.30.0;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
|
@ -152,13 +155,10 @@ configvar CSI_PROW_KIND_VERSION "$(kind_version_default)" "kind"
|
|||
|
||||
# kind images to use. Must match the kind version.
|
||||
# The release notes of each kind release list the supported images.
|
||||
configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
|
||||
kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
|
||||
kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105
|
||||
kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207
|
||||
kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
|
||||
kindest/node:v1.19.16@sha256:d9c819e8668de8d5030708e484a9fdff44d95ec4675d136ef0a0a584e587f65c
|
||||
kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fcdbd126188e6d7" "kind images"
|
||||
configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a
|
||||
kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2
|
||||
kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1
|
||||
kindest/node:v1.31.12@sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2" "kind images"
|
||||
|
||||
# By default, this script tests sidecars with the CSI hostpath driver,
|
||||
# using the install_csi_driver function. That function depends on
|
||||
|
|
@ -196,7 +196,7 @@ kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fc
|
|||
# If the deployment script is called with CSI_PROW_TEST_DRIVER=<file name> as
|
||||
# environment variable, then it must write a suitable test driver configuration
|
||||
# into that file in addition to installing the driver.
|
||||
configvar CSI_PROW_DRIVER_VERSION "v1.8.0" "CSI driver version"
|
||||
configvar CSI_PROW_DRIVER_VERSION "v1.17.0" "CSI driver version"
|
||||
configvar CSI_PROW_DRIVER_REPO https://github.com/kubernetes-csi/csi-driver-host-path "CSI driver repo"
|
||||
configvar CSI_PROW_DEPLOYMENT "" "deployment"
|
||||
configvar CSI_PROW_DEPLOYMENT_SUFFIX "" "additional suffix in kubernetes-x.yy[suffix].yaml files"
|
||||
|
|
@ -228,8 +228,11 @@ configvar CSI_PROW_E2E_VERSION "$(version_to_git "${CSI_PROW_KUBERNETES_VERSION}
|
|||
configvar CSI_PROW_E2E_REPO "https://github.com/kubernetes/kubernetes" "E2E repo"
|
||||
configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package"
|
||||
|
||||
# Local path for e2e tests. Set to "none" to disable.
|
||||
configvar CSI_PROW_SIDECAR_E2E_IMPORT_PATH "none" "CSI Sidecar E2E package"
|
||||
# Local path & package path for e2e tests. Set to "none" to disable.
|
||||
# When using versioned go modules, the import path is the module path whereas the path
|
||||
# should not contain the version and be the directory where the module is checked out.
|
||||
configvar CSI_PROW_SIDECAR_E2E_IMPORT_PATH "none" "CSI Sidecar E2E package (go import path)"
|
||||
configvar CSI_PROW_SIDECAR_E2E_PATH "${CSI_PROW_SIDECAR_E2E_IMPORT_PATH}" "CSI Sidecar E2E path (directory)"
|
||||
|
||||
# csi-sanity testing from the csi-test repo can be run against the installed
|
||||
# CSI driver. For this to work, deploying the driver must expose the Unix domain
|
||||
|
|
@ -237,7 +240,7 @@ configvar CSI_PROW_SIDECAR_E2E_IMPORT_PATH "none" "CSI Sidecar E2E package"
|
|||
# of the cluster. The alternative would have been to (cross-)compile csi-sanity
|
||||
# and install it inside the cluster, which is not necessarily easier.
|
||||
configvar CSI_PROW_SANITY_REPO https://github.com/kubernetes-csi/csi-test "csi-test repo"
|
||||
configvar CSI_PROW_SANITY_VERSION v5.0.0 "csi-test version"
|
||||
configvar CSI_PROW_SANITY_VERSION v5.3.1 "csi-test version"
|
||||
configvar CSI_PROW_SANITY_PACKAGE_PATH github.com/kubernetes-csi/csi-test "csi-test package"
|
||||
configvar CSI_PROW_SANITY_SERVICE "hostpath-service" "Kubernetes TCP service name that exposes csi.sock"
|
||||
configvar CSI_PROW_SANITY_POD "csi-hostpathplugin-0" "Kubernetes pod with CSI driver"
|
||||
|
|
@ -245,7 +248,7 @@ configvar CSI_PROW_SANITY_CONTAINER "hostpath" "Kubernetes container with CSI dr
|
|||
|
||||
# The version of dep to use for 'make test-vendor'. Ignored if the project doesn't
|
||||
# use dep. Only binary releases of dep are supported (https://github.com/golang/dep/releases).
|
||||
configvar CSI_PROW_DEP_VERSION v0.5.1 "golang dep version to be used for vendor checking"
|
||||
configvar CSI_PROW_DEP_VERSION v0.5.4 "golang dep version to be used for vendor checking"
|
||||
|
||||
# Each job can run one or more of the following tests, identified by
|
||||
# a single word:
|
||||
|
|
@ -419,7 +422,7 @@ die () {
|
|||
exit 1
|
||||
}
|
||||
|
||||
# Ensure that PATH has the desired version of the Go tools, then run command given as argument.
|
||||
# Ensure we use the desired version of the Go tools, then run command given as argument.
|
||||
# Empty parameter uses the already installed Go. In Prow, that version is kept up-to-date by
|
||||
# bumping the container image regularly.
|
||||
run_with_go () {
|
||||
|
|
@ -427,15 +430,16 @@ run_with_go () {
|
|||
version="$1"
|
||||
shift
|
||||
|
||||
if ! [ "$version" ] || go version 2>/dev/null | grep -q "go$version"; then
|
||||
run "$@"
|
||||
else
|
||||
if ! [ -d "${CSI_PROW_WORK}/go-$version" ]; then
|
||||
run curl --fail --location "https://dl.google.com/go/go$version.linux-amd64.tar.gz" | tar -C "${CSI_PROW_WORK}" -zxf - || die "installation of Go $version failed"
|
||||
mv "${CSI_PROW_WORK}/go" "${CSI_PROW_WORK}/go-$version"
|
||||
if [ "$version" ]; then
|
||||
version=go$version
|
||||
if [ "$(GOTOOLCHAIN=$version go version | cut -d' ' -f3)" != "$version" ]; then
|
||||
die "Please install Go 1.21+"
|
||||
fi
|
||||
PATH="${CSI_PROW_WORK}/go-$version/bin:$PATH" run "$@"
|
||||
else
|
||||
version=local
|
||||
fi
|
||||
# Set GOMODCACHE to make sure Kubernetes does not need to download again.
|
||||
GOTOOLCHAIN=$version GOMODCACHE="$(go env GOMODCACHE)" run "$@"
|
||||
}
|
||||
|
||||
# Ensure that we have the desired version of kind.
|
||||
|
|
@ -469,7 +473,7 @@ install_dep () {
|
|||
if dep version 2>/dev/null | grep -q "version:.*${CSI_PROW_DEP_VERSION}$"; then
|
||||
return
|
||||
fi
|
||||
run curl --fail --location -o "${CSI_PROW_WORK}/bin/dep" "https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64" &&
|
||||
run curl --fail --location -o "${CSI_PROW_WORK}/bin/dep" "https://github.com/golang/dep/releases/download/${CSI_PROW_DEP_VERSION}/dep-linux-amd64" &&
|
||||
chmod u+x "${CSI_PROW_WORK}/bin/dep"
|
||||
}
|
||||
|
||||
|
|
@ -561,7 +565,15 @@ go_version_for_kubernetes () (
|
|||
local version="$2"
|
||||
local go_version
|
||||
|
||||
# We use the minimal Go version specified for each K8S release (= minimum_go_version in hack/lib/golang.sh).
|
||||
# Try to get the version for .go-version
|
||||
go_version="$( cat "$path/.go-version" )"
|
||||
if [ "$go_version" ]; then
|
||||
echo "$go_version"
|
||||
return
|
||||
fi
|
||||
|
||||
# Fall back to hack/lib/golang.sh parsing.
|
||||
# This is necessary in v1.26.0 and older Kubernetes releases that do not have .go-version.
|
||||
# More recent versions might also work, but we don't want to count on that.
|
||||
go_version="$(grep minimum_go_version= "$path/hack/lib/golang.sh" | sed -e 's/.*=go//')"
|
||||
if ! [ "$go_version" ]; then
|
||||
|
|
@ -610,7 +622,7 @@ start_cluster () {
|
|||
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
|
||||
# Changing into the Kubernetes source code directory is a workaround for https://github.com/kubernetes-sigs/kind/issues/1910
|
||||
# shellcheck disable=SC2046
|
||||
(cd "${CSI_PROW_WORK}/src/kubernetes" && run_with_go "$go_version" kind build node-image --image csiprow/node:latest --kube-root "${CSI_PROW_WORK}/src/kubernetes") || die "'kind build node-image' failed"
|
||||
(cd "${CSI_PROW_WORK}/src/kubernetes" && run_with_go "$go_version" kind build node-image "${CSI_PROW_WORK}/src/kubernetes" --image csiprow/node:latest) || die "'kind build node-image' failed"
|
||||
csi_prow_kind_have_kubernetes=true
|
||||
fi
|
||||
image="csiprow/node:latest"
|
||||
|
|
@ -872,10 +884,17 @@ install_snapshot_controller() {
|
|||
cnt=0
|
||||
expected_running_pods=$(kubectl apply --dry-run=client -o "jsonpath={.spec.replicas}" -f "$SNAPSHOT_CONTROLLER_YAML")
|
||||
expected_namespace=$(kubectl apply --dry-run=client -o "jsonpath={.metadata.namespace}" -f "$SNAPSHOT_CONTROLLER_YAML")
|
||||
while [ "$(kubectl get pods -n "$expected_namespace" -l app=snapshot-controller | grep 'Running' -c)" -lt "$expected_running_pods" ]; do
|
||||
expect_key='app\.kubernetes\.io/name'
|
||||
expected_label=$(kubectl apply --dry-run=client -o "jsonpath={.spec.template.metadata.labels['$expect_key']}" -f "$SNAPSHOT_CONTROLLER_YAML")
|
||||
if [ -z "${expected_label}" ]; then
|
||||
expect_key='app'
|
||||
expected_label=$(kubectl apply --dry-run=client -o "jsonpath={.spec.template.metadata.labels['$expect_key']}" -f "$SNAPSHOT_CONTROLLER_YAML")
|
||||
fi
|
||||
expect_key=${expect_key//\\/}
|
||||
while [ "$(kubectl get pods -n "$expected_namespace" -l "$expect_key"="$expected_label" | grep 'Running' -c)" -lt "$expected_running_pods" ]; do
|
||||
if [ $cnt -gt 30 ]; then
|
||||
echo "snapshot-controller pod status:"
|
||||
kubectl describe pods -n "$expected_namespace" -l app=snapshot-controller
|
||||
kubectl describe pods -n "$expected_namespace" -l "$expect_key"="$expected_label"
|
||||
echo >&2 "ERROR: snapshot controller not ready after over 5 min"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -1008,17 +1027,20 @@ run_e2e () (
|
|||
# the full Kubernetes E2E testsuite while only running a few tests.
|
||||
move_junit () {
|
||||
if ls "${ARTIFACTS}"/junit_[0-9]*.xml 2>/dev/null >/dev/null; then
|
||||
run_filter_junit -t="External.Storage|CSI.mock.volume" -o "${ARTIFACTS}/junit_${name}.xml" "${ARTIFACTS}"/junit_[0-9]*.xml && rm -f "${ARTIFACTS}"/junit_[0-9]*.xml
|
||||
mkdir -p "${ARTIFACTS}/junit/${name}" &&
|
||||
mkdir -p "${ARTIFACTS}/junit/steps" &&
|
||||
run_filter_junit -t="External.Storage|CSI.mock.volume" -o "${ARTIFACTS}/junit/steps/junit_${name}.xml" "${ARTIFACTS}"/junit_[0-9]*.xml &&
|
||||
mv "${ARTIFACTS}"/junit_[0-9]*.xml "${ARTIFACTS}/junit/${name}/"
|
||||
fi
|
||||
}
|
||||
trap move_junit EXIT
|
||||
|
||||
if [ "${name}" == "local" ]; then
|
||||
cd "${GOPATH}/src/${CSI_PROW_SIDECAR_E2E_IMPORT_PATH}" &&
|
||||
run_with_loggers env KUBECONFIG="$KUBECONFIG" KUBE_TEST_REPO_LIST="$(if [ -e "${CSI_PROW_WORK}/e2e-repo-list" ]; then echo "${CSI_PROW_WORK}/e2e-repo-list"; fi)" ginkgo -v "$@" "${CSI_PROW_WORK}/e2e-local.test" -- -report-dir "${ARTIFACTS}" -report-prefix local
|
||||
cd "${GOPATH}/src/${CSI_PROW_SIDECAR_E2E_PATH}" &&
|
||||
run_with_loggers env KUBECONFIG="$KUBECONFIG" KUBE_TEST_REPO_LIST="$(if [ -e "${CSI_PROW_WORK}/e2e-repo-list" ]; then echo "${CSI_PROW_WORK}/e2e-repo-list"; fi)" ginkgo --timeout="${CSI_PROW_GINKGO_TIMEOUT}" -v "$@" "${CSI_PROW_WORK}/e2e-local.test" -- -report-dir "${ARTIFACTS}" -report-prefix local
|
||||
else
|
||||
cd "${GOPATH}/src/${CSI_PROW_E2E_IMPORT_PATH}" &&
|
||||
run_with_loggers env KUBECONFIG="$KUBECONFIG" KUBE_TEST_REPO_LIST="$(if [ -e "${CSI_PROW_WORK}/e2e-repo-list" ]; then echo "${CSI_PROW_WORK}/e2e-repo-list"; fi)" ginkgo -v "$@" "${CSI_PROW_WORK}/e2e.test" -- -report-dir "${ARTIFACTS}" -storage.testdriver="${CSI_PROW_WORK}/test-driver.yaml"
|
||||
run_with_loggers env KUBECONFIG="$KUBECONFIG" KUBE_TEST_REPO_LIST="$(if [ -e "${CSI_PROW_WORK}/e2e-repo-list" ]; then echo "${CSI_PROW_WORK}/e2e-repo-list"; fi)" ginkgo --timeout="${CSI_PROW_GINKGO_TIMEOUT}" -v "$@" "${CSI_PROW_WORK}/e2e.test" -- -report-dir "${ARTIFACTS}" -storage.testdriver="${CSI_PROW_WORK}/test-driver.yaml"
|
||||
fi
|
||||
)
|
||||
|
||||
|
|
@ -1085,13 +1107,14 @@ kubectl exec "$pod" -c "${CSI_PROW_SANITY_CONTAINER}" -- /bin/sh -c "\${CHECK_PA
|
|||
EOF
|
||||
|
||||
chmod u+x "${CSI_PROW_WORK}"/*dir_in_pod.sh
|
||||
mkdir -p "${ARTIFACTS}/junit/steps"
|
||||
|
||||
# This cannot run in parallel, because -csi.junitfile output
|
||||
# from different Ginkgo nodes would go to the same file. Also the
|
||||
# staging and target directories are the same.
|
||||
run_with_loggers "${CSI_PROW_WORK}/csi-sanity" \
|
||||
-ginkgo.v \
|
||||
-csi.junitfile "${ARTIFACTS}/junit_sanity.xml" \
|
||||
-csi.junitfile "${ARTIFACTS}/junit/steps/junit_sanity.xml" \
|
||||
-csi.endpoint "dns:///$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' csi-prow-control-plane):$(kubectl get "services/${CSI_PROW_SANITY_SERVICE}" -o "jsonpath={..nodePort}")" \
|
||||
-csi.stagingdir "/tmp/staging" \
|
||||
-csi.mountdir "/tmp/mount" \
|
||||
|
|
@ -1121,7 +1144,8 @@ make_test_to_junit () {
|
|||
# Plain make-test.xml was not delivered as text/xml by the web
|
||||
# server and ignored by spyglass. It seems that the name has to
|
||||
# match junit*.xml.
|
||||
out="${ARTIFACTS}/junit_make_test.xml"
|
||||
out="${ARTIFACTS}/junit/steps/junit_make_test.xml"
|
||||
mkdir -p "$(dirname "$out")"
|
||||
testname=
|
||||
echo "<testsuite>" >>"$out"
|
||||
|
||||
|
|
@ -1305,7 +1329,7 @@ main () {
|
|||
if tests_enabled "parallel"; then
|
||||
# Ignore: Double quote to prevent globbing and word splitting.
|
||||
# shellcheck disable=SC2086
|
||||
if ! run_e2e parallel ${CSI_PROW_GINKO_PARALLEL} \
|
||||
if ! run_e2e parallel ${CSI_PROW_GINKGO_PARALLEL} \
|
||||
-focus="$focus" \
|
||||
-skip="$(regex_join "${CSI_PROW_E2E_SERIAL}" "${CSI_PROW_E2E_ALPHA}" "${CSI_PROW_E2E_SKIP}")"; then
|
||||
warn "E2E parallel failed"
|
||||
|
|
@ -1315,7 +1339,7 @@ main () {
|
|||
# Run tests that are feature tagged, but non-alpha
|
||||
# Ignore: Double quote to prevent globbing and word splitting.
|
||||
# shellcheck disable=SC2086
|
||||
if ! run_e2e parallel-features ${CSI_PROW_GINKO_PARALLEL} \
|
||||
if ! run_e2e parallel-features ${CSI_PROW_GINKGO_PARALLEL} \
|
||||
-focus="$focus.*($(regex_join "${CSI_PROW_E2E_FOCUS}"))" \
|
||||
-skip="$(regex_join "${CSI_PROW_E2E_SERIAL}")"; then
|
||||
warn "E2E parallel features failed"
|
||||
|
|
@ -1363,7 +1387,7 @@ main () {
|
|||
if tests_enabled "parallel-alpha"; then
|
||||
# Ignore: Double quote to prevent globbing and word splitting.
|
||||
# shellcheck disable=SC2086
|
||||
if ! run_e2e parallel-alpha ${CSI_PROW_GINKO_PARALLEL} \
|
||||
if ! run_e2e parallel-alpha ${CSI_PROW_GINKGO_PARALLEL} \
|
||||
-focus="$focus.*($(regex_join "${CSI_PROW_E2E_ALPHA}"))" \
|
||||
-skip="$(regex_join "${CSI_PROW_E2E_SERIAL}" "${CSI_PROW_E2E_SKIP}")"; then
|
||||
warn "E2E parallel alpha failed"
|
||||
|
|
@ -1385,8 +1409,8 @@ main () {
|
|||
fi
|
||||
|
||||
# Merge all junit files into one. This gets rid of duplicated "skipped" tests.
|
||||
if ls "${ARTIFACTS}"/junit_*.xml 2>/dev/null >&2; then
|
||||
run_filter_junit -o "${CSI_PROW_WORK}/junit_final.xml" "${ARTIFACTS}"/junit_*.xml && rm "${ARTIFACTS}"/junit_*.xml && mv "${CSI_PROW_WORK}/junit_final.xml" "${ARTIFACTS}"
|
||||
if ls "${ARTIFACTS}"/junit/steps/junit_*.xml 2>/dev/null >&2; then
|
||||
run_filter_junit -o "${ARTIFACTS}/junit_final.xml" "${ARTIFACTS}"/junit/steps/junit_*.xml
|
||||
fi
|
||||
|
||||
return "$ret"
|
||||
|
|
|
|||
|
|
@ -20,11 +20,17 @@
|
|||
|
||||
set -ex
|
||||
|
||||
# Prow checks out repos with --filter=blob:none. This breaks
|
||||
# "git subtree pull" unless we enable fetching missing file content.
|
||||
GIT_NO_LAZY_FETCH=0
|
||||
export GIT_NO_LAZY_FETCH
|
||||
|
||||
# It must be called inside the updated csi-release-tools repo.
|
||||
CSI_RELEASE_TOOLS_DIR="$(pwd)"
|
||||
|
||||
# Update the other repo.
|
||||
cd "$PULL_TEST_REPO_DIR"
|
||||
git reset --hard # Shouldn't be necessary, but somehow is to avoid "fatal: working tree has modifications. Cannot add." (https://stackoverflow.com/questions/3623351/git-subtree-pull-says-that-the-working-tree-has-modifications-but-git-status-sa)
|
||||
git subtree pull --squash --prefix=release-tools "$CSI_RELEASE_TOOLS_DIR" master
|
||||
git log -n2
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2024 The Kubernetes Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This script uses the logcheck tool to analyze the source code
|
||||
# for proper usage of klog contextual logging.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
LOGCHECK_VERSION=${1:-0.10.0}
|
||||
|
||||
# This will canonicalize the path
|
||||
CSI_LIB_UTIL_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd -P)
|
||||
|
||||
# Create a temporary directory for installing logcheck and
|
||||
# set up a trap command to remove it when the script exits.
|
||||
CSI_LIB_UTIL_TEMP=$(mktemp -d 2>/dev/null || mktemp -d -t csi-lib-utils.XXXXXX)
|
||||
trap 'rm -rf "${CSI_LIB_UTIL_TEMP}"' EXIT
|
||||
|
||||
echo "Installing logcheck to temp dir: sigs.k8s.io/logtools/logcheck@v${LOGCHECK_VERSION}"
|
||||
GOBIN="${CSI_LIB_UTIL_TEMP}" go install "sigs.k8s.io/logtools/logcheck@v${LOGCHECK_VERSION}"
|
||||
echo "Verifying logcheck: ${CSI_LIB_UTIL_TEMP}/logcheck -check-contextual ${CSI_LIB_UTIL_ROOT}/..."
|
||||
"${CSI_LIB_UTIL_TEMP}/logcheck" -check-contextual -check-with-helpers "${CSI_LIB_UTIL_ROOT}/..."
|
||||
Loading…
Reference in New Issue