Skip to content

Commit c261616

Browse files
committed
Fix logic of version_gt in deploy script
- version_gt was not properly stripping the 'kubernetes-' prefix - The kubernetes version (from the deployment directory name) was not being passed to version_gt to determine whether the snapshot class should be deployed. Signed-off-by: John Strunk <[email protected]>
1 parent 4ad78ab commit c261616

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

deploy/util/deploy-hostpath.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ function rbac_version () {
102102
# version_gt 1.1.1 release-1.2.0 (returns false)
103103
# version_gt 1.2.0 1.2.2 (returns false)
104104
function version_gt() {
105-
versions=$(for ver in "$@"; do ver=${ver#release-}; echo ${ver#v}; done)
105+
versions=$(for ver in "$@"; do ver=${ver#release-}; ver=${ver#kubernetes-}; echo ${ver#v}; done)
106106
greaterVersion=${1#"release-"};
107-
greaterVersion=${1#"kubernetes-"};
107+
greaterVersion=${greaterVersion#"kubernetes-"};
108108
greaterVersion=${greaterVersion#"v"};
109109
test "$(printf '%s' "$versions" | sort -V | head -n 1)" != "$greaterVersion"
110110
}
@@ -221,7 +221,7 @@ done
221221
# deploy snapshotclass
222222
echo "deploying snapshotclass based on snapshotter version"
223223
snapshotter_version="$(rbac_version "${BASE_DIR}/hostpath/csi-hostpath-snapshotter.yaml" csi-snapshotter false)"
224-
driver_version="$(basename $PWD)"
224+
driver_version="$(basename "${BASE_DIR}")"
225225
if version_gt "$driver_version" "1.16"; then
226226
kubectl apply -f "https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${snapshotter_version}/examples/kubernetes/snapshotclass.yaml"
227227
fi

0 commit comments

Comments
 (0)