Skip to content

Commit d6522cf

Browse files
committed
chore(workflow): custom haproxy port
1 parent ba298d8 commit d6522cf

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

_scripts/install.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ function clean_before_exit {
2121
# delay before exiting, so stdout/stderr flushes through the logging system
2222
rm -rf /tmp/drycc-values.yaml /etc/rancher/k3s/registries.yaml
2323
configure_registries runtime
24-
systemctl restart k3s
2524
sleep 3
2625
}
2726
trap clean_before_exit EXIT
@@ -322,24 +321,24 @@ global
322321
user haproxy
323322
group haproxy
324323
daemon
325-
listen http-80
326-
bind *:80
324+
listen http
325+
bind *:${HAPROXY_HTTP_PORT:-80}
327326
mode tcp
328327
maxconn 100000
329328
timeout connect 60s
330329
timeout client 30000
331330
timeout server 30000
332331
server ingress ${INGRESS_IP}:80 check
333-
listen https-443
334-
bind *:443
332+
listen https
333+
bind *:${HAPROXY_HTTPS_PORT:-443}
335334
mode tcp
336335
maxconn 100000
337336
timeout connect 60s
338337
timeout client 30000
339338
timeout server 30000
340339
server ingress ${INGRESS_IP}:443 check
341340
listen builder
342-
bind *:2222
341+
bind *:${HAPROXY_BUILDER_PORT:-2222}
343342
mode tcp
344343
maxconn 100000
345344
timeout connect 60s

src/quickstart/install-workflow.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,11 @@ RABBITMQ_PERSISTENCE_SIZE | The size of the persistence space a
210210
RABBITMQ_PERSISTENCE_STORAGE_CLASS | StorangeClass of `rabbitmq`; default storangeclass is used by default
211211
HELMBROKER_PERSISTENCE_SIZE | The size of the persistence space allocated to `helmbroker`, which is `5Gi` by default
212212
HELMBROKER_PERSISTENCE_STORAGE_CLASS | StorangeClass of `helmbroker`; default storangeclass is used by default
213-
K3S_DATA_DIR | The config of k3s data dir; If not set, the default path is used
214-
LONGHORN_DATA_PATH | The defaultDataPath of longhorn; If not set, the default path is used
213+
K3S_DATA_DIR | The config of k3s data dir; If not set, the default path is used
214+
LONGHORN_DATA_PATH | The defaultDataPath of longhorn; If not set, the default path is used
215+
HAPROXY_HTTP_PORT | The drycc ingress http port of haproxy for external exposure, default `80`
216+
HAPROXY_HTTPS_PORT | The drycc ingress https port of haproxy for external exposure, default `443`
217+
HAPROXY_BUILDER_PORT | The drycc builder port of haproxy for external exposure, default `2222`
215218

216219
Since the installation script will install k3s, other environment variables can refer to k3s installation [environment variables](https://rancher.com/docs/k3s/latest/en/installation/install-options/).
217220

0 commit comments

Comments
 (0)