Skip to content

Commit dd4d8e9

Browse files
committed
chore(workflow): add CERT_MANAGER_ENABLED env
1 parent 44981e9 commit dd4d8e9

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

_scripts/install.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ EOF
199199
--set builder.service.type=LoadBalancer \
200200
--set global.cluster_domain="cluster.local" \
201201
--set global.platform_domain="${PLATFORM_DOMAIN}" \
202+
--set global.cert_manager_enabled=${CERT_MANAGER_ENABLED:-true} \
202203
--set global.ingress_class=nginx \
203204
--set fluentd.daemon_environment.CONTAINER_TAIL_PARSER_TYPE="/^(?<time>.+) (?<stream>stdout|stderr)( (?<tags>.))? (?<log>.*)$/" \
204205
--set controller.app_storage_class=${CONTROLLER_APP_STORAGE_CLASS:-""} \
@@ -242,6 +243,7 @@ function install_helmbroker {
242243
--set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \
243244
--set persistence.storageClass=${HELMBROKER_PERSISTENCE_STORAGE_CLASS:=""} \
244245
--set platform_domain=${PLATFORM_DOMAIN} \
246+
--set cert_manager_enabled=${CERT_MANAGER_ENABLED:-true} \
245247
--set username=${HELMBROKER_USERNAME} \
246248
--set password=${HELMBROKER_PASSWORD} \
247249
--set environment.HELMBROKER_CELERY_BROKER="amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWORD}@drycc-rabbitmq-0.drycc-rabbitmq.drycc.svc.cluster.local:5672/drycc" \
@@ -250,6 +252,11 @@ repositories:
250252
- name: drycc-helm-broker
251253
url: ${addons_url}
252254
EOF
255+
if [[ "${CERT_MANAGER_ENABLED:-true}" == "true" ]] ; then
256+
BROKER_URL="https://${HELMBROKER_USERNAME}:${HELMBROKER_PASSWORD}@drycc-helmbroker.${PLATFORM_DOMAIN}"
257+
else
258+
BROKER_URL="http://${HELMBROKER_USERNAME}:${HELMBROKER_PASSWORD}@drycc-helmbroker.${PLATFORM_DOMAIN}"
259+
fi
253260

254261
kubectl apply -f - <<EOF
255262
apiVersion: servicecatalog.k8s.io/v1beta1
@@ -265,7 +272,7 @@ metadata:
265272
spec:
266273
relistBehavior: Duration
267274
relistRequests: 5
268-
url: https://${HELMBROKER_USERNAME}:${HELMBROKER_PASSWORD}@drycc-helmbroker.${PLATFORM_DOMAIN}
275+
url: ${BROKER_URL}
269276
EOF
270277

271278
echo -e "\\033[32m---> Helmbroker username: $HELMBROKER_USERNAME\\033[0m"

src/quickstart/install-workflow.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,14 @@ $ export PLATFORM_DOMAIN=59.46.3.190.nip.io
124124

125125
## Install
126126

127-
You can use the installation script available at https://www.drycc.cc/install.sh to install drycc as a service on systemd and openrc based systems.
127+
Before installation, please make sure whether your installation environment is a public network.
128+
If it is an intranet environment and there is no public IP, you need to disable the automatic certificate.
129+
130+
```
131+
$ export CERT_MANAGER_ENABLED=false
132+
```
133+
134+
Then you can use the installation script available at https://www.drycc.cc/install.sh to install drycc as a service on systemd and openrc based systems.
128135

129136
```
130137
$ curl -sfL https://www.drycc.cc/install.sh | bash -
@@ -186,6 +193,7 @@ ENVIRONMENT VARIABLE | DESCRIPTION
186193
PLATFORM_DOMAIN | Required item, specify drycc's domain name
187194
DRYCC_ADMIN_USERNAME | Required item, specify drycc's admin username
188195
DRYCC_ADMIN_PASSWORD | Required item, specify drycc's admin password
196+
CERT_MANAGER_ENABLED | Whether to use automatic certificate. It is `true` by default
189197
CHANNEL | By default, `stable` channel will be installed. You can also specify `testing`
190198
USE_HAPROXY | Haproxy is enabled by default. If you want to turn it off, this value is false
191199
METALLB_ADDRESS_POOLS | IP pool for LoadBalancer. The default is `172.16.0.0/12`

0 commit comments

Comments
 (0)