Skip to content

Commit 2a0eca1

Browse files
committed
chore(workflow): change drycc gateway listener name
1 parent 84ae1a8 commit 2a0eca1

2 files changed

Lines changed: 5 additions & 19 deletions

File tree

_scripts/install.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ shopt -s expand_aliases
44

55
# default vars
66
GATEWAY_CLASS="istio"
7-
CLUSTER_DOMAIN="cluster.local"
7+
CLUSTER_CIDR=${CLUSTER_CIDR:-"10.43.0.0/16"}
8+
CLUSTER_DOMAIN=${CLUSTER_DOMAIN:-"cluster.local"}
89
CERT_MANAGER_ENABLED="${CERT_MANAGER_ENABLED:false}"
910
DRYCC_REGISTRY="${DRYCC_REGISTRY:-registry.drycc.cc}"
1011
CHARTS_URL=oci://registry.drycc.cc/$([ "$CHANNEL" == "stable" ] && echo charts || echo charts-testing)
@@ -213,7 +214,7 @@ function install_k3s_server {
213214
configure_os
214215
download_runtime
215216
configure_mirrors
216-
INSTALL_K3S_EXEC="server ${INSTALL_K3S_EXEC} --flannel-backend=none --disable-network-policy --disable=traefik --disable=servicelb --disable-kube-proxy --cluster-cidr=10.233.0.0/16"
217+
INSTALL_K3S_EXEC="server ${INSTALL_K3S_EXEC} --flannel-backend=none --disable-network-policy --disable=traefik --disable=servicelb --disable-kube-proxy --cluster-cidr=${CLUSTER_CIDR} --cluster-domain=${CLUSTER_DOMAIN}"
217218
if [[ -n "${K3S_DATA_DIR}" ]] ; then
218219
INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --data-dir=${K3S_DATA_DIR}/rancher/k3s"
219220
fi
@@ -345,9 +346,9 @@ function install_gateway() {
345346
helm repo add istio https://github.com/istio-charts
346347
helm repo update
347348
kubectl apply -f $gateway_api_url/releases/download/${version}/experimental-install.yaml
348-
helm install istio-base istio/base -n istio-system --create-namespace
349+
helm install istio-base istio/base -n istio-system --set defaultRevision=default --create-namespace --wait
349350
helm install istio-istiod istio/istiod -n istio-system --wait
350-
helm install istio-gateway istio/gateway -n istio-system --wait
351+
helm install istio-gateway istio/gateway -n istio-gateway --create-namespace --wait
351352
echo -e "\\033[32m---> Gateway installed!\\033[0m"
352353
}
353354

charts/workflow/values.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -313,18 +313,3 @@ gateway:
313313
externalAccountBinding:
314314
keyID: ""
315315
keySecret: ""
316-
# This will be the hostname prefix that is used to build endpoints
317-
domainPrefixs:
318-
- drycc
319-
- drycc-rabbitmq
320-
- drycc-passport
321-
- drycc-prometheus
322-
- drycc-monitor-grafana
323-
# custom listeners
324-
customListeners:
325-
- name: drycc-gateway-listener-builder-tcp
326-
port: 2222
327-
protocol: TCP
328-
allowedRoutes:
329-
namespaces:
330-
from: All

0 commit comments

Comments
 (0)