Skip to content

Commit 0d9ab4a

Browse files
Squashed 'release-tools/' changes from b66c082..6613c39
6613c39 Merge pull request kubernetes-csi#223 from sunnylovestiramisu/update 0e7ae99 Update k8s image repo url 77e47cc Merge pull request kubernetes-csi#222 from xinydev/fix-dep-version 155854b Fix dep version mismatch 8f83905 Merge pull request kubernetes-csi#221 from sunnylovestiramisu/go-update 1d3f94d Update go version to 1.20 to match k/k v1.27 e322ce5 Merge pull request kubernetes-csi#220 from andyzhangx/fix-golint-error b74a512 test: fix golint error aa61bfd Merge pull request kubernetes-csi#218 from xing-yang/update_csi_driver 7563d19 Update CSI_PROW_DRIVER_VERSION to v1.11.0 a2171be Merge pull request kubernetes-csi#216 from msau42/process cb98782 Merge pull request kubernetes-csi#217 from msau42/owners a11216e add new reviewers and remove inactive reviewers dd98675 Add step for checking builds git-subtree-dir: release-tools git-subtree-split: 6613c39
1 parent 51c9db1 commit 0d9ab4a

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

KUBERNETES_CSI_OWNERS_ALIASES

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,19 @@ aliases:
2222
- ggriffiths
2323
- gnufied
2424
- humblec
25+
- mauriciopoppe
2526
- j-griffith
26-
- Jiawei0227
2727
- jingxu97
2828
- jsafrane
2929
- pohly
3030
- RaunakShah
31+
- sunnylovestiramisu
3132
- xing-yang
3233

3334
# This documents who previously contributed to Kubernetes-CSI
3435
# as approver.
3536
emeritus_approvers:
37+
- Jiawei0227
3638
- lpabon
3739
- sbezverk
3840
- vladimirvivien

SIDECAR_RELEASE_PROCESS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
9292
1. Check that all [canary CI
9393
jobs](https://k8s-testgrid.appspot.com/sig-storage-csi-ci) are passing,
9494
and that test coverage is adequate for the changes that are going into the release.
95+
1. Check that the post-\<sidecar\>-push-images builds are succeeding.
96+
[Example](https://k8s-testgrid.appspot.com/sig-storage-image-build#post-external-snapshotter-push-images)
9597
1. Make sure that no new PRs have merged in the meantime, and no PRs are in
9698
flight and soon to be merged.
9799
1. Create a new release following a previous release as a template. Be sure to select the correct
@@ -102,7 +104,7 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
102104
1. Check [image build status](https://k8s-testgrid.appspot.com/sig-storage-image-build).
103105
1. Promote images from k8s-staging-sig-storage to k8s.gcr.io/sig-storage. From
104106
the [k8s image
105-
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage),
107+
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage),
106108
run `./generate.sh > images.yaml`, and send a PR with the updated images.
107109
Once merged, the image promoter will copy the images from staging to prod.
108110
1. Update [kubernetes-csi/docs](https://github.com/kubernetes-csi/docs) sidecar

filter-junit.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ package main
2424
import (
2525
"encoding/xml"
2626
"flag"
27-
"io/ioutil"
2827
"os"
2928
"regexp"
3029
)
@@ -96,7 +95,7 @@ func main() {
9695
}
9796
} else {
9897
var err error
99-
data, err = ioutil.ReadFile(input)
98+
data, err = os.ReadFile(input)
10099
if err != nil {
101100
panic(err)
102101
}
@@ -143,7 +142,7 @@ func main() {
143142
panic(err)
144143
}
145144
} else {
146-
if err := ioutil.WriteFile(*output, data, 0644); err != nil {
145+
if err := os.WriteFile(*output, data, 0644); err != nil {
147146
panic(err)
148147
}
149148
}

prow.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -pp
8686
# which is disabled with GOFLAGS=-mod=vendor).
8787
configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory"
8888

89-
configvar CSI_PROW_GO_VERSION_BUILD "1.19" "Go version for building the component" # depends on component's source code
89+
configvar CSI_PROW_GO_VERSION_BUILD "1.20" "Go version for building the component" # depends on component's source code
9090
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
9191
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
9292
configvar CSI_PROW_GO_VERSION_KIND "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building 'kind'" # depends on CSI_PROW_KIND_VERSION below
@@ -196,7 +196,7 @@ kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fc
196196
# If the deployment script is called with CSI_PROW_TEST_DRIVER=<file name> as
197197
# environment variable, then it must write a suitable test driver configuration
198198
# into that file in addition to installing the driver.
199-
configvar CSI_PROW_DRIVER_VERSION "v1.8.0" "CSI driver version"
199+
configvar CSI_PROW_DRIVER_VERSION "v1.11.0" "CSI driver version"
200200
configvar CSI_PROW_DRIVER_REPO https://github.com/kubernetes-csi/csi-driver-host-path "CSI driver repo"
201201
configvar CSI_PROW_DEPLOYMENT "" "deployment"
202202
configvar CSI_PROW_DEPLOYMENT_SUFFIX "" "additional suffix in kubernetes-x.yy[suffix].yaml files"
@@ -245,7 +245,7 @@ configvar CSI_PROW_SANITY_CONTAINER "hostpath" "Kubernetes container with CSI dr
245245

246246
# The version of dep to use for 'make test-vendor'. Ignored if the project doesn't
247247
# use dep. Only binary releases of dep are supported (https://github.com/golang/dep/releases).
248-
configvar CSI_PROW_DEP_VERSION v0.5.1 "golang dep version to be used for vendor checking"
248+
configvar CSI_PROW_DEP_VERSION v0.5.4 "golang dep version to be used for vendor checking"
249249

250250
# Each job can run one or more of the following tests, identified by
251251
# a single word:
@@ -469,7 +469,7 @@ install_dep () {
469469
if dep version 2>/dev/null | grep -q "version:.*${CSI_PROW_DEP_VERSION}$"; then
470470
return
471471
fi
472-
run curl --fail --location -o "${CSI_PROW_WORK}/bin/dep" "https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64" &&
472+
run curl --fail --location -o "${CSI_PROW_WORK}/bin/dep" "https://github.com/golang/dep/releases/download/${CSI_PROW_DEP_VERSION}/dep-linux-amd64" &&
473473
chmod u+x "${CSI_PROW_WORK}/bin/dep"
474474
}
475475

0 commit comments

Comments
 (0)