Skip to content

Commit a16c2f0

Browse files
committed
Squashed 'release-tools/' changes from f325590..204bc89
kubernetes-csi/csi-release-tools@204bc89c Merge kubernetes-csi/csi-release-tools#158 from pohly/fix-deployment-selection kubernetes-csi/csi-release-tools@61538bb7 prow.sh: more flexible CSI_PROW_DEPLOYMENT kubernetes-csi/csi-release-tools@2b0e6db9 Merge kubernetes-csi/csi-release-tools#157 from humblec/csi-release kubernetes-csi/csi-release-tools@a2fcd6de Adding myself to csi reviewers group git-subtree-dir: release-tools git-subtree-split: 204bc89
1 parent 76db306 commit a16c2f0

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

KUBERNETES_CSI_OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ aliases:
2121
- chrishenzie
2222
- ggriffiths
2323
- gnufied
24+
- humblec
2425
- j-griffith
2526
- Jiawei0227
2627
- jingxu97

prow.sh

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -654,22 +654,30 @@ delete_cluster_inside_prow_job() {
654654
# Looks for the deployment as specified by CSI_PROW_DEPLOYMENT and CSI_PROW_KUBERNETES_VERSION
655655
# in the given directory.
656656
find_deployment () {
657-
local dir file
657+
local dir file k8sver
658658
dir="$1"
659659

660-
# Fixed deployment name? Use it if it exists, otherwise fail.
660+
# major/minor without release- prefix.
661+
k8sver="$(echo "${CSI_PROW_KUBERNETES_VERSION}" | sed -e 's/\([0-9]*\)\.\([0-9]*\).*/\1.\2/' -e 's/^release-//')"
662+
663+
# Fixed deployment name? Use it if it exists.
661664
if [ "${CSI_PROW_DEPLOYMENT}" ]; then
662665
file="$dir/${CSI_PROW_DEPLOYMENT}/deploy.sh"
663-
if ! [ -e "$file" ]; then
666+
if [ -e "$file" ]; then
667+
echo "$file"
668+
return 0
669+
fi
670+
671+
# CSI_PROW_DEPLOYMENT=kubernetes-x.yy is handled below with a fallback
672+
# to kubernetes-latest. If it is something else, then fail here.
673+
if ! echo "${CSI_PROW_DEPLOYMENT}" | grep -q "^kubernetes-${k8sver}\$"; then
664674
return 1
665675
fi
666-
echo "$file"
667-
return 0
668676
fi
669677

670678
# Ignore: See if you can use ${variable//search/replace} instead.
671679
# shellcheck disable=SC2001
672-
file="$dir/kubernetes-$(echo "${CSI_PROW_KUBERNETES_VERSION}" | sed -e 's/\([0-9]*\)\.\([0-9]*\).*/\1.\2/')${CSI_PROW_DEPLOYMENT_SUFFIX}/deploy.sh"
680+
file="$dir/kubernetes-${k8sver}${CSI_PROW_DEPLOYMENT_SUFFIX}/deploy.sh"
673681
if ! [ -e "$file" ]; then
674682
file="$dir/kubernetes-latest${CSI_PROW_DEPLOYMENT_SUFFIX}/deploy.sh"
675683
if ! [ -e "$file" ]; then

0 commit comments

Comments
 (0)