Skip to content

Commit 29bd50a

Browse files
committed
fix(install): catalog version
1 parent aac9c1f commit 29bd50a

1 file changed

Lines changed: 23 additions & 3 deletions

File tree

install.sh

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,21 @@ function install_cert_manager() {
455455
}
456456

457457
function install_catalog() {
458+
service_catalog_version="canary"
459+
if [[ "$CHANNEL" == "stable" ]]; then
460+
if [[ "${INSTALL_DRYCC_MIRROR}" == "cn" ]] ; then
461+
service_catalog_url=https://github.com/drycc-addons/service-catalog
462+
else
463+
service_catalog_url=https://github.com/drycc-addons/service-catalog
464+
fi
465+
service_catalog_version=$(curl -Ls $service_catalog_url/releases|grep /drycc-addons/service-catalog/releases/tag/ | sed -E 's/.*\/drycc-addons\/service-catalog\/releases\/tag\/(v[0-9\.]{1,}(-rc.[0-9]{1,})?)".*/\1/g' | head -1)
466+
fi
467+
458468
options=${1:-""}
459469
echo -e "\\033[32m---> Start install catalog...\\033[0m"
460470
helm upgrade --install catalog $CHARTS_URL/catalog \
461471
--set asyncBindingOperationsEnabled=true \
462-
--set image=registry.drycc.cc/drycc-addons/service-catalog:canary \
472+
--set image=registry.drycc.cc/drycc-addons/service-catalog:${service_catalog_version} \
463473
--namespace catalog \
464474
--create-namespace --wait $options
465475
echo -e "\\033[32m---> Catalog install completed!\\033[0m"
@@ -651,10 +661,20 @@ EOF
651661

652662
function install_helmbroker {
653663
if [[ "${INSTALL_DRYCC_MIRROR}" == "cn" ]] ; then
654-
addons_url="https://github.com/drycc-addons/addons/releases/download/latest/index.yaml"
664+
addons_base_url="https://github.com/drycc-addons/addons"
655665
else
656-
addons_url="https://github.com/drycc-addons/addons/releases/download/latest/index.yaml"
666+
addons_base_url="https://github.com/drycc-addons/addons"
657667
fi
668+
version="latest"
669+
if [[ "$CHANNEL" == "stable" ]]; then
670+
for version in $(curl -Ls "${addons_base_url}"/releases|grep /drycc-addons/addons/releases/tag/ | sed -E 's/.*\/drycc-addons\/addons\/releases\/tag\/(v[0-9]{1,})".*/\1/g'); do
671+
if [[ "$version" != "latest" ]]; then
672+
break
673+
fi
674+
done
675+
fi
676+
addons_url="${addons_base_url}/releases/download/${version}/index.yaml"
677+
658678
options=${1:-""}
659679
local VALKEY_PASSWORD=$(kubectl get secrets -n drycc valkey-creds -o jsonpath="{.data.password}"| base64 -d)
660680
local HELMBROKER_USERNAME=${HELMBROKER_USERNAME:-$(cat /proc/sys/kernel/random/uuid)}

0 commit comments

Comments
 (0)