Skip to content

Commit db022ca

Browse files
committed
chore(workflow): remove resources
1 parent 1ac7f10 commit db022ca

1 file changed

Lines changed: 1 addition & 89 deletions

File tree

install.sh

Lines changed: 1 addition & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -529,33 +529,13 @@ function install_cert_manager() {
529529
echo -e "\\033[32m---> Cert-manager install completed!\\033[0m"
530530
}
531531

532-
# install_catalog deploys the Kubernetes Service Catalog via Helm.
533-
# Uses the "canary" image by default; fetches the latest stable version when CHANNEL is "stable".
534-
# Usage: install_catalog [helm-options...]
535-
function install_catalog() {
536-
service_catalog_version="canary"
537-
if [[ "$CHANNEL" == "stable" ]]; then
538-
service_catalog_version=$(get_latest_github_release "drycc-addons/service-catalog" "^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$")
539-
fi
540-
541-
options=${1:-""}
542-
echo -e "\\033[32m---> Start install catalog...\\033[0m"
543-
helm_upgrade catalog $CHARTS_URL/catalog \
544-
--set asyncBindingOperationsEnabled=true \
545-
--set image=registry.drycc.cc/drycc-addons/service-catalog:${service_catalog_version#v} \
546-
--namespace catalog \
547-
--create-namespace --wait $options
548-
echo -e "\\033[32m---> Catalog install completed!\\033[0m"
549-
}
550-
551532
# install_components installs all infrastructure components in order:
552-
# network (Cilium), metallb, gateway (Istio), cert-manager, catalog.
533+
# network (Cilium), metallb, gateway (Istio), cert-manager.
553534
function install_components {
554535
install_network
555536
install_metallb
556537
install_gateway
557538
install_cert_manager
558-
install_catalog
559539
}
560540

561541
# check_drycc validates that required environment variables are set before installing workflow.
@@ -744,83 +724,16 @@ EOF
744724
echo -e "\\033[32m---> Workflow install completed!\\033[0m"
745725
}
746726

747-
# install_helmbroker deploys the Helm Broker and registers it as a ClusterServiceBroker.
748-
# Usage: install_helmbroker [helm-options...]
749-
# HELMBROKER_USERNAME - override the auto-generated broker username
750-
# HELMBROKER_PASSWORD - override the auto-generated broker password
751-
function install_helmbroker {
752-
if [[ "${INSTALL_DRYCC_MIRROR}" == "cn" ]] ; then
753-
addons_base_url="https://github.com/drycc-addons/addons"
754-
else
755-
addons_base_url="https://github.com/drycc-addons/addons"
756-
fi
757-
version="latest"
758-
if [[ "$CHANNEL" == "stable" ]]; then
759-
version=$(get_latest_github_release "drycc-addons/addons" "^v[0-9]+$")
760-
version=${version:-latest}
761-
fi
762-
addons_url="${addons_base_url}/releases/download/${version}/index.yaml"
763-
764-
options=${1:-""}
765-
local VALKEY_PASSWORD=$(kubectl get secrets -n drycc valkey-creds -o jsonpath="{.data.password}"| base64 -d)
766-
local HELMBROKER_USERNAME=${HELMBROKER_USERNAME:-$(kubectl get secrets -n drycc-helmbroker helmbroker-creds -o jsonpath="{.data.username}" 2>/dev/null | base64 -d || cat /proc/sys/kernel/random/uuid)}
767-
local HELMBROKER_PASSWORD=${HELMBROKER_PASSWORD:-$(kubectl get secrets -n drycc-helmbroker helmbroker-creds -o jsonpath="{.data.password}" 2>/dev/null | base64 -d || cat /proc/sys/kernel/random/uuid)}
768-
769-
echo -e "\\033[32m---> Start install helmbroker...\\033[0m"
770-
771-
helm_upgrade helmbroker $CHARTS_URL/helmbroker \
772-
--set valkey.enabled=false \
773-
--set gateway.gatewayClass=${GATEWAY_CLASS} \
774-
--set global.platformDomain=${PLATFORM_DOMAIN} \
775-
--set global.certManagerEnabled=${CERT_MANAGER_ENABLED} \
776-
--set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \
777-
--set persistence.storageClass=${HELMBROKER_PERSISTENCE_STORAGE_CLASS:-"longhorn"} \
778-
--set username=${HELMBROKER_USERNAME} \
779-
--set password=${HELMBROKER_PASSWORD} \
780-
--set replicas=${HELMBROKER_REPLICAS} \
781-
--set valkeyUrl=redis://:${VALKEY_PASSWORD}@drycc-valkey.drycc.svc:16379/11 \
782-
--set api.replicas=${HELMBROKER_API_REPLICAS} \
783-
--set celery.replicas=${HELMBROKER_CELERY_REPLICAS} \
784-
--namespace drycc-helmbroker --create-namespace $options --wait -f - <<EOF
785-
repositories:
786-
- name: drycc-helmbroker
787-
url: ${addons_url}
788-
EOF
789-
790-
kubectl apply -f - <<EOF
791-
apiVersion: servicecatalog.k8s.io/v1beta1
792-
kind: ClusterServiceBroker
793-
metadata:
794-
finalizers:
795-
- kubernetes-incubator/service-catalog
796-
generation: 1
797-
labels:
798-
app.kubernetes.io/managed-by: Helm
799-
heritage: Helm
800-
name: helmbroker
801-
spec:
802-
relistBehavior: Duration
803-
relistRequests: 5
804-
url: http://${HELMBROKER_USERNAME}:${HELMBROKER_PASSWORD}@drycc-helmbroker.drycc-helmbroker.svc
805-
EOF
806-
807-
echo -e "\\033[32m---> Helmbroker username: $HELMBROKER_USERNAME\\033[0m"
808-
echo -e "\\033[32m---> Helmbroker password: $HELMBROKER_PASSWORD\\033[0m"
809-
echo -e "\\033[32m---> Helmbroker install completed!\\033[0m"
810-
}
811-
812727
# upgrade upgrades all installed components using --reset-then-reuse-values to preserve
813728
# previous Helm values while applying new chart defaults.
814729
function upgrade {
815730
install_network --reset-then-reuse-values
816731
install_metallb --reset-then-reuse-values
817732
install_gateway --reset-then-reuse-values
818733
install_cert_manager --reset-then-reuse-values
819-
install_catalog --reset-then-reuse-values
820734
install_longhorn --reset-then-reuse-values
821735
install_mountpoint --reset-then-reuse-values
822736
install_drycc --reset-then-reuse-values
823-
install_helmbroker --reset-then-reuse-values
824737
echo -e "\\033[32m---> Upgrade complete, enjoy life...\\033[0m"
825738
}
826739

@@ -835,7 +748,6 @@ if [[ -z "$@" ]] ; then
835748
install_longhorn
836749
install_mountpoint
837750
install_drycc
838-
install_helmbroker
839751
echo -e "\\033[32m---> Installation complete, enjoy life...\\033[0m"
840752
else
841753
for command in "$@"

0 commit comments

Comments
 (0)