From f5d22ffcdb113ef5bc5633e2ea1c713adc3f5cfd Mon Sep 17 00:00:00 2001 From: Krishna Pagadala Date: Mon, 18 Dec 2017 13:48:51 -0800 Subject: [PATCH] add port to discovery address (#730) Automatic merge from submit-queue. add port to discovery address **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #(, fixes #, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` --- tools/deb/istio-start.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/deb/istio-start.sh b/tools/deb/istio-start.sh index 282b25b0b1d5..bda61cec2345 100755 --- a/tools/deb/istio-start.sh +++ b/tools/deb/istio-start.sh @@ -39,6 +39,7 @@ ISTIO_CFG=${ISTIO_CFG:-/var/lib/istio} NS=${ISTIO_NAMESPACE:-default} SVC=${ISTIO_SERVICE:-rawvm} ISTIO_SYSTEM_NAMESPACE=${ISTIO_SYSTEM_NAMESPACE:-istio-system} +ISTIO_PILOT_PORT=${ISTIO_PILOT_PORT:-15003} CONTROL_PLANE_AUTH_POLICY=${CONTROL_PLANE_AUTH_POLICY:-MUTUAL_TLS} @@ -62,7 +63,7 @@ fi ${ISTIO_BIN_BASE}/istio-iptables.sh if [ -f ${ISTIO_BIN_BASE}/pilot-agent ]; then - exec su -s /bin/bash -c "INSTANCE_IP=${ISTIO_SVC_IP} POD_NAME=${POD_NAME} POD_NAMESPACE=${NS} exec ${ISTIO_BIN_BASE}/pilot-agent proxy --serviceCluster $SVC --discoveryAddress istio-pilot.${ISTIO_SYSTEM_NAMESPACE} --controlPlaneAuthPolicy $CONTROL_PLANE_AUTH_POLICY > ${ISTIO_LOG_DIR}/istio.log" istio-proxy + exec su -s /bin/bash -c "INSTANCE_IP=${ISTIO_SVC_IP} POD_NAME=${POD_NAME} POD_NAMESPACE=${NS} exec ${ISTIO_BIN_BASE}/pilot-agent proxy --serviceCluster $SVC --discoveryAddress istio-pilot.${ISTIO_SYSTEM_NAMESPACE}:${ISTIO_PILOT_PORT} --controlPlaneAuthPolicy $CONTROL_PLANE_AUTH_POLICY 2> ${ISTIO_LOG_DIR}/istio.err.log > ${ISTIO_LOG_DIR}/istio.log" istio-proxy else ENVOY_CFG=${ENVOY_CFG:-${ISTIO_CFG}/envoy/envoy.json} # Run envoy directly - agent not installed. This should be used only for debugging/testing standalone envoy