envoy-config: fix port name in setup_backend.sh (kubeflow#219)

This should fix kubeflow#3628. See also kubeflow#3691 (which modified the wrong file).
arrikto · Jul 19, 2019 · 21160c1 · 21160c1
1 parent e40fa53
commit 21160c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gcp/iap-ingress/base/config-map.yaml b/gcp/iap-ingress/base/config-map.yaml
@@ -115,7 +115,7 @@ data:
       . /var/shared/healthz.env
 
       # If node port or backend id change, so does the JWT audience.
-      CURR_NODE_PORT=$(kubectl --namespace=${NAMESPACE} get svc ${SERVICE} -o jsonpath='{.spec.ports[0].nodePort}')
+      CURR_NODE_PORT=$(kubectl --namespace=${NAMESPACE} get svc ${SERVICE} -o jsonpath='{.spec.ports[?(@.name=="http2")].nodePort}')
       read -ra toks <<<"$(gcloud compute --project=${PROJECT} backend-services list --filter=name~k8s-be-${CURR_NODE_PORT}- --format='value(id,timeoutSec)')"
       CURR_BACKEND_ID="${toks[0]}"
       CURR_BACKEND_TIMEOUT="${toks[1]}"

diff --git a/tests/iap-ingress-base_test.go b/tests/iap-ingress-base_test.go
@@ -225,7 +225,7 @@ data:
       . /var/shared/healthz.env
 
       # If node port or backend id change, so does the JWT audience.
-      CURR_NODE_PORT=$(kubectl --namespace=${NAMESPACE} get svc ${SERVICE} -o jsonpath='{.spec.ports[0].nodePort}')
+      CURR_NODE_PORT=$(kubectl --namespace=${NAMESPACE} get svc ${SERVICE} -o jsonpath='{.spec.ports[?(@.name=="http2")].nodePort}')
       read -ra toks <<<"$(gcloud compute --project=${PROJECT} backend-services list --filter=name~k8s-be-${CURR_NODE_PORT}- --format='value(id,timeoutSec)')"
       CURR_BACKEND_ID="${toks[0]}"
       CURR_BACKEND_TIMEOUT="${toks[1]}"