Merge pull request #8462 from brendandburns/examples

Switch Phabricator to use service accounts.
pull/6/head
Daniel Smith 2015-05-19 10:14:51 -07:00
commit 920a25a1d1
3 changed files with 9 additions and 6 deletions

View File

@ -140,7 +140,7 @@ To automate this process and make sure that a proper host is authorized even if
"containers": [
{
"name": "authenticator",
"image": "fgrzadkowski/example-cloudsql-authenticator"
"image": "gcr.io.google_containers/cloudsql-authenticator:v1"
}
]
}

View File

@ -22,7 +22,7 @@
"containers": [
{
"name": "authenticator",
"image": "fgrzadkowski/example-cloudsql-authenticator"
"image": "gcr.io/google_containers/cloudsql-authenticator:v1"
}
]
}

View File

@ -18,10 +18,13 @@
# should only send updates if something changes. We should be able to do
# this by comparing pod creation time with the last scan time.
while true; do
hostport="${KUBERNETES_RO_SERVICE_HOST}:${KUBERNETES_RO_SERVICE_PORT}"
path="api/v1beta1/pods"
hostport="https://kubernetes.default.cluster.local"
token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
path="api/v1beta3/pods"
query="labels=$SELECTOR"
ips_json=`curl ${hostport}/${path}?${query} 2>/dev/null | grep hostIP`
# TODO: load in the CAS cert when we distributed it on all platforms.
ips_json=`curl ${hostport}/${path}?${query} --insecure --header "Authorization: Bearer ${token}" 2>/dev/null | grep hostIP`
ips=`echo $ips_json | cut -d'"' -f 4 | sed 's/,$//'`
echo "Adding IPs $ips"
gcloud sql instances patch $CLOUDSQL_DB --authorized-networks $ips