Skip to content

Commit 3b9b136

Browse files
authored
Merge pull request #886 from replicatedhq/laverya/skip-upgrading-rook
skip upgrading rook, leave existing version in place
2 parents e00c7f1 + afb16c3 commit 3b9b136

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

addons/rook/1.4.3/install.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@ CEPH_VERSION=15.2.4-20200819
33
function rook_pre_init() {
44
local version=$(rook_version)
55
if [ -n "$version" ] && [ "$version" != "1.4.3" ]; then
6-
bail "Rook $version is already installed"
7-
fi
8-
if [ "$ROOK_BLOCK_STORAGE_ENABLED" != "1" ]; then
6+
printf "Rook $version is already installed, will not upgrade to 1.4.3\n"
7+
export SKIP_ROOK_INSTALL='true'
8+
elif [ "$ROOK_BLOCK_STORAGE_ENABLED" != "1" ]; then
99
bail "Rook 1.4.3 requires enabling block storage"
1010
fi
1111
}
1212

1313
function rook() {
1414
rook_lvm2
15+
16+
if [ -n "$SKIP_ROOK_INSTALL" ]; then
17+
local version=$(rook_version)
18+
printf "Rook $version is already installed, will not upgrade to 1.4.3\n"
19+
return 0
20+
fi
21+
1522
rook_operator_deploy
1623
rook_set_ceph_pool_replicas
1724
rook_ready_spinner # creating the cluster before the operator is ready fails

0 commit comments

Comments
 (0)