Skip to content

Commit 1032702

Browse files
committed
chore(workflow): use default storage class
1 parent f52a708 commit 1032702

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

_scripts/install.sh

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ function install_helm {
3030
tar -zxvf "${tar_name}"
3131
mv "linux-${ARCH}/helm" /usr/local/bin/helm
3232
rm -rf "${tar_name}" "linux-${ARCH}"
33+
helm repo add drycc https://charts.drycc.cc/${CHANNEL:-stable}
3334
}
3435

3536
function pre_install_k3s {
@@ -83,8 +84,6 @@ function install_k3s_agent {
8384

8485
function install_components {
8586
mount bpffs -t bpf /sys/fs/bpf
86-
install_helm
87-
helm repo add drycc https://charts.drycc.cc/${CHANNEL:-stable}
8887
helm repo update
8988

9089
echo -e "\\033[32m---> Waiting for helm to install components...\\033[0m"
@@ -104,8 +103,9 @@ EOF
104103
}
105104

106105
function install_longhorn {
106+
kubectl patch storageclass local-path -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"false"}}}'
107107
helm install longhorn drycc/longhorn --create-namespace \
108-
--set persistence.defaultClass=false \
108+
--set persistence.defaultClass=true \
109109
--set persistence.defaultClassReplicaCount=1 \
110110
--namespace longhorn-system --wait
111111
}
@@ -145,21 +145,16 @@ function install_drycc {
145145
--set global.platform_domain="${PLATFORM_DOMAIN}" \
146146
--set global.ingress_class=nginx \
147147
--set fluentd.daemon_environment.CONTAINER_TAIL_PARSER_TYPE="/^(?<time>.+) (?<stream>stdout|stderr)( (?<tags>.))? (?<log>.*)$/" \
148-
--set controller.app_storage_class=longhorn \
149148
--set minio.persistence.enabled=true \
150-
--set minio.persistence.size=${MINIO_PERSISTENCE_SIZE:-5Gi} \
151-
--set minio.persistence.storageClass="longhorn" \
149+
--set minio.persistence.size=${MINIO_PERSISTENCE_SIZE:-20Gi} \
152150
--set rabbitmq.username="${RABBITMQ_USERNAME}" \
153151
--set rabbitmq.password="${RABBITMQ_PASSWORD}" \
154152
--set rabbitmq.persistence.enabled=true \
155153
--set rabbitmq.persistence.size=${RABBITMQ_PERSISTENCE_SIZE:-5Gi} \
156-
--set rabbitmq.persistence.storageClass="longhorn" \
157154
--set influxdb.persistence.enabled=true \
158155
--set influxdb.persistence.size=${INFLUXDB_PERSISTENCE_SIZE:-5Gi} \
159-
--set influxdb.persistence.storageClass="longhorn" \
160156
--set monitor.grafana.persistence.enabled=true \
161157
--set monitor.grafana.persistence.size=${MONITOR_PERSISTENCE_SIZE:-5Gi} \
162-
--set monitor.grafana.persistence.storageClass="longhorn" \
163158
--set passport.admin_username=${DRYCC_ADMIN_USERNAME} \
164159
--set passport.admin_password=${DRYCC_ADMIN_PASSWORD} \
165160
--namespace drycc \
@@ -177,7 +172,6 @@ function install_helmbroker {
177172
helm install helmbroker drycc/helmbroker \
178173
--set ingress_class="nginx" \
179174
--set platform_domain="cluster.local" \
180-
--set persistence.storageClass="longhorn" \
181175
--set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \
182176
--set platform_domain=${PLATFORM_DOMAIN} \
183177
--set username=${HELMBROKER_USERNAME} \
@@ -259,6 +253,7 @@ EOF
259253

260254
if [[ -z "$@" ]] ; then
261255
install_k3s_server
256+
install_helm
262257
install_components
263258
install_longhorn
264259
install_drycc

src/quickstart/install-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ CHANNEL | By default, `stable` channel will be installed
185185
USE_HAPROXY | Haproxy is enabled by default. If you want to turn it off, this value is false
186186
METALLB_ADDRESS_POOLS | IP pool for LoadBalancer. The default is `172.16.0.0/12`
187187
INSTALL_DRYCC_MIRROR | Specify the accelerated mirror location. Currently, only `cn` is supported
188-
MINIO_PERSISTENCE_SIZE | The size of the persistence space allocated to `minio`, which is `5Gi` by default
188+
MINIO_PERSISTENCE_SIZE | The size of the persistence space allocated to `minio`, which is `20Gi` by default
189189
MONITOR_PERSISTENCE_SIZE | The size of the persistence space allocated to `monitor`, which is `5Gi` by default
190190
INFLUXDB_PERSISTENCE_SIZE | The size of the persistence space allocated to `influxdb`, which is `5Gi` by default
191191
RABBITMQ_PERSISTENCE_SIZE | The size of the persistence space allocated to `rabbitmq`, which is `5Gi` by default

0 commit comments

Comments
 (0)