diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-12-04 12:59:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-04 12:59:02 +0000 |
| commit | 693bc2491bb1249f3e0313a31c4240f5f65e3ba3 (patch) | |
| tree | 017678d36cf8e81cdd4b941893c022e228c3b017 /kubernetes/pnda/charts/dcae-pnda-bootstrap/resources/scripts | |
| parent | a8149b2cf3fe63dd6ffcb7dcb108656ae9136381 (diff) | |
| parent | 00520bcdb6f1bced922ed97016f42d370d3d2722 (diff) | |
Merge "Make the PNDA mirror accessible via a NodePort"
Diffstat (limited to 'kubernetes/pnda/charts/dcae-pnda-bootstrap/resources/scripts')
| -rw-r--r-- | kubernetes/pnda/charts/dcae-pnda-bootstrap/resources/scripts/bootstrap.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kubernetes/pnda/charts/dcae-pnda-bootstrap/resources/scripts/bootstrap.sh b/kubernetes/pnda/charts/dcae-pnda-bootstrap/resources/scripts/bootstrap.sh index 1c2608ac7d..e9b6f34bd3 100644 --- a/kubernetes/pnda/charts/dcae-pnda-bootstrap/resources/scripts/bootstrap.sh +++ b/kubernetes/pnda/charts/dcae-pnda-bootstrap/resources/scripts/bootstrap.sh @@ -49,17 +49,21 @@ KUBE_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) for i in 1 2 3 4 5 6 7 8 9 do - MIRROR_IP=$(curl -s $KUBE_API/namespaces/{{ include "common.namespace" . }}/services/dcae-pnda-mirror \ - --header "Authorization: Bearer $KUBE_TOKEN" \ - --insecure | jq -r '.status.loadBalancer.ingress[0].ip') + MIRROR_IP=$(curl -s $KUBE_API/namespaces/{{ include "common.namespace" . }}/pods \ + --header "Authorization: Bearer $KUBE_TOKEN" \ + --insecure | jq -r '.items[].status | select(.containerStatuses != null) | select(.containerStatuses[].ready and .containerStatuses[].name=="dcae-pnda-mirror") | .hostIP') + MIRROR_PORT=$(curl -s $KUBE_API/namespaces/{{ include "common.namespace" . }}/services/dcae-pnda-mirror \ + --header "Authorization: Bearer $KUBE_TOKEN" \ + --insecure | jq -r '.spec.ports[] | select(.name=="dcae-pnda-mirror") | .nodePort') - if [ "$MIRROR_IP" != "null" ]; then + if [ "x${MIRROR_IP}" != "xnull" -a "x${MIRROR_PORT}" != "xnull" ]; then + PNDA_MIRROR="http://$MIRROR_IP:$MIRROR_PORT" break fi sleep 5 done -PNDA_MIRROR="http://$MIRROR_IP:80" +[ -z "${PNDA_MIRROR}" ] && { echo "Unable to get PNDA mirror IP:PORT"; exit 1; } sed -i -e 's?CLIENT_IP/32?CLIENT_IP?' bootstrap-scripts/package-install.sh |