From 6fd748e2c56191bb8a2a29f8f101b8badd1a18ad Mon Sep 17 00:00:00 2001 From: Jefftree Date: Thu, 5 Mar 2020 16:43:16 -0800 Subject: [PATCH] exit if KONNECTIVITY_SERVICE_PROXY_PROTOCOL_MODE is set incorrectly --- cluster/gce/gci/configure-helper.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index cb04ab9a547..2ac0d176071 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1683,11 +1683,13 @@ function prepare-konnectivity-server-manifest { params+=("--uds-name=/etc/srv/kubernetes/konnectivity-server/konnectivity-server.socket") params+=("--cluster-cert=/etc/srv/kubernetes/pki/apiserver.crt") params+=("--cluster-key=/etc/srv/kubernetes/pki/apiserver.key") - if [[ "${KONNECTIVITY_SERVICE_PROXY_PROTOCOL_MODE:-grpc}" == 'http-connect' ]]; then + if [[ "${KONNECTIVITY_SERVICE_PROXY_PROTOCOL_MODE:-grpc}" == 'grpc' ]]; then + params+=("--mode=grpc") + elif [[ "${KONNECTIVITY_SERVICE_PROXY_PROTOCOL_MODE:-grpc}" == 'http-connect' ]]; then params+=("--mode=http-connect") else - # We can assume the mode is GRPC because we check for a valid protocol beforehand - params+=("--mode=grpc") + echo "KONNECTIVITY_SERVICE_PROXY_PROTOCOL_MODE must be set to either grpc or http-connect" + exit 1 fi params+=("--server-port=0")