Merge pull request #1425 from cloudfoundry-incubator/viccuad/fix-upg-…

…cleanup-rel2.5

Add dns record for ssh_proxy in upgrade job too, in release-2.5 branch

.concourse/tasks/upgrade.sh

@@ -107,13 +107,18 @@ make kubecf
 # Setup dns
 tcp_router_ip=$(kubectl get svc -n scf tcp-router-public -o json | jq -r .status.loadBalancer.ingress[].ip | head -n 1)
 public_router_ip=$(kubectl get svc -n scf router-public -o json | jq -r .status.loadBalancer.ingress[].ip | head -n 1)
+# ssh-proxy service is named differently in diego and eirini
+ssh_proxy_svc=$(kubectl get svc -n scf | grep ssh-proxy | awk '{print $1}' | head -n 1)
+ssh_proxy_ip=$(kubectl get svc -n scf "${ssh_proxy_svc}" -o json | jq -r .status.loadBalancer.ingress[].ip | head -n 1)
 
 gcloud --quiet beta dns --project="${GKE_PROJECT}" record-sets transaction start \
        --zone="${GKE_DNS_ZONE}"
 gcloud --quiet beta dns --project="${GKE_PROJECT}" record-sets transaction add \
        --name="*.${DOMAIN}." --ttl=300 --type=A --zone="${GKE_DNS_ZONE}" "$public_router_ip"
 gcloud --quiet beta dns --project="${GKE_PROJECT}" record-sets transaction add \
        --name="tcp.${DOMAIN}." --ttl=300 --type=A --zone="${GKE_DNS_ZONE}" "${tcp_router_ip}"
+gcloud --quiet beta dns --project="${GKE_PROJECT}" record-sets transaction add \
+       --name="ssh.${DOMAIN}." --ttl=300 --type=A --zone="${GKE_DNS_ZONE}" "$ssh_proxy_ip"
 gcloud --quiet beta dns --project="${GKE_PROJECT}" record-sets transaction execute \
        --zone="${GKE_DNS_ZONE}"