Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Memorystore GCE : Replace GCS_APP_LOCATION with GCS_BUCKET_NAME #728

Merged
merged 4 commits into from
Sep 7, 2018
Merged

Memorystore GCE : Replace GCS_APP_LOCATION with GCS_BUCKET_NAME #728

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04e20bc
Fixing GCE deployment script for Cloud Memorystore
jabubake Aug 10, 2018
4944109
Merge remote-tracking branch 'origin' into patch-memorystore-gce
jabubake Aug 31, 2018
ac8dfb8
Memorystore GCE : Replace GCS_APP_LOCATION with GCS_BUCKET_NAME
jabubake Aug 31, 2018
f08bec1
Merge branch 'master' into patch-memorystore-gce
fhinkel Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions memorystore/redis/gce_deployment/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ if [ -z "$REDISPORT" ]; then
exit 1
fi

if [ -z "$GCS_APP_LOCATION" ]; then
echo "Must set \$GCS_APP_LOCATION. For example: GCS_APP_LOCATION=gs://my-bucket/gce/"
if [ -z "$GCS_BUCKET_NAME" ]; then
echo "Must set \$GCS_BUCKET_NAME. For example: GCS_BUCKET_NAME=my-bucket"
exit 1
fi

Expand All @@ -36,8 +36,7 @@ fi

#Upload the tar to GCS
tar -cvf app.tar -C .. package.json server.js
# Copy to GCS bucket
gsutil cp app.tar $GCS_APP_LOCATION
gsutil cp app.tar gs://"$GCS_BUCKET_NAME"/gce/

# Create an instance
gcloud compute instances create my-instance \
Expand All @@ -46,7 +45,7 @@ gcloud compute instances create my-instance \
--machine-type=g1-small \
--scopes cloud-platform \
--metadata-from-file startup-script=startup-script.sh \
--metadata app-location=$GCS_APP_LOCATION,redis-host=$REDISHOST,redis-port=$REDISPORT \
--metadata gcs-bucket=$GCS_BUCKET_NAME,redis-host=$REDISHOST,redis-port=$REDISPORT \
--zone $ZONE \
--tags http-server

Expand Down
4 changes: 2 additions & 2 deletions memorystore/redis/gce_deployment/startup-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -ex

# Talk to the metadata server to get the project id and location of application binary.
PROJECTID=$(curl -s "http://metadata.google.internal/computeMetadata/v1/project/project-id" -H "Metadata-Flavor: Google")
GCS_APP_LOCATION=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/attributes/app-location" -H "Metadata-Flavor: Google")
GCS_BUCKET_NAME=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/attributes/gcs-bucket" -H "Metadata-Flavor: Google")
REDISHOST=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/attributes/redis-host" -H "Metadata-Flavor: Google")
REDISPORT=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/attributes/redis-port" -H "Metadata-Flavor: Google")

Expand All @@ -34,7 +34,7 @@ apt-get install -yq ca-certificates supervisor nodejs build-essential
curl -s "https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh" | bash
service google-fluentd restart &

gsutil cp "$GCS_APP_LOCATION"** /
gsutil cp gs://"$GCS_BUCKET_NAME"/gce/app.tar /app.tar
mkdir -p /app
tar -x -f /app.tar -C /app
cd /app
Expand Down