Skip to content

Commit 836fbf1

Browse files
committed
chore(workflow): user rabbitmqUrl replace env
1 parent 085d773 commit 836fbf1

1 file changed

Lines changed: 8 additions & 24 deletions

File tree

_scripts/install.sh

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
set -eo pipefail
33
shopt -s expand_aliases
44

5+
DRYCC_REGISTRY="${DRYCC_REGISTRY:-registry.drycc.cc}"
6+
57
# initArch discovers the architecture for this system.
68
init_arch() {
79
ARCH=$(uname -m)
@@ -17,25 +19,6 @@ init_arch() {
1719
esac
1820
}
1921

20-
init_registry() {
21-
CHARTS_URL=oci://registry.drycc.cc/$([ "$CHANNEL" == "stable" ] && echo charts || echo charts-testing)
22-
if [[ -z "$DRYCC_REGISTRY" ]] ; then
23-
echo -e "\\033[32m---> Get the fastest drycc registry...\\033[0m"
24-
registrys=(quay.io ccr.ccs.tencentyun.com sgccr.ccs.tencentyun.com jpccr.ccs.tencentyun.com uswccr.ccs.tencentyun.com useccr.ccs.tencentyun.com deccr.ccs.tencentyun.com saoccr.ccs.tencentyun.com)
25-
delay=65535
26-
DRYCC_REGISTRY=quay.io
27-
for registry in ${registrys[@]}
28-
do
29-
time_total=$(curl -o /dev/null -s -w "%{time_total}" "https://$registry")
30-
if [[ `echo "$delay>$time_total"|bc` -eq 1 ]];then
31-
delay=$time_total
32-
DRYCC_REGISTRY=$registry
33-
fi
34-
done
35-
fi
36-
echo -e "\\033[32m---> The drycc registry is: ${DRYCC_REGISTRY}\\033[0m"
37-
}
38-
3922
function clean_before_exit {
4023
# delay before exiting, so stdout/stderr flushes through the logging system
4124
rm -rf /tmp/drycc-values.yaml
@@ -562,17 +545,18 @@ function install_helmbroker {
562545
echo -e "\\033[32m---> Start installing helmbroker...\\033[0m"
563546

564547
helm install helmbroker $CHARTS_URL/helmbroker \
565-
--set ingressClass="traefik" \
566-
--set platformDomain="cluster.local" \
548+
--set global.rabbitmqLocation="off-cluster" \
549+
--set global.ingressClass="traefik" \
550+
--set global.clusterDomain="cluster.local" \
551+
--set global.platformDomain=${PLATFORM_DOMAIN} \
552+
--set global.certManagerEnabled=${CERT_MANAGER_ENABLED:-true} \
567553
--set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \
568554
--set persistence.storageClass=${HELMBROKER_PERSISTENCE_STORAGE_CLASS:-"drycc-storage"} \
569-
--set platformDomain=${PLATFORM_DOMAIN} \
570-
--set certManagerEnabled=${CERT_MANAGER_ENABLED:-true} \
571555
--set username=${HELMBROKER_USERNAME} \
572556
--set password=${HELMBROKER_PASSWORD} \
573557
--set replicas=${HELMBROKER_REPLICAS} \
574558
--set celeryReplicas=${HELMBROKER_CELERY_REPLICAS} \
575-
--set environment.HELMBROKER_CELERY_BROKER="amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWORD}@drycc-rabbitmq.drycc.svc.cluster.local:5672/drycc" \
559+
--set rabbitmqUrl="amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWORD}@drycc-rabbitmq.drycc.svc.cluster.local:5672/drycc" \
576560
--namespace drycc --create-namespace --wait -f - <<EOF
577561
repositories:
578562
- name: drycc-helm-broker

0 commit comments

Comments
 (0)