Merge pull request #4 from CommercialTribe/develop

Release

.gitignore

@@ -0,0 +1 @@
+.idea

.travis.yml

@@ -7,24 +7,19 @@ env:
     - CLOUDSDK_CONTAINER_USE_CLIENT_CERTIFICATE=True
 before_deploy:
   # Authorize with gcloud
+  - echo $GCLOUD_ENCODED_CREDS | base64 -d > /tmp/gcloud.json
+  - gcloud auth activate-service-account $(jq -r ".client_email" /tmp/gcloud.json) --key-file=/tmp/gcloud.json
   - >
     if [[ -n "$TRAVIS_TAG" ]] ; then
-      echo $GCLOUD_ENCODED_CREDS | base64 -d > /tmp/gcloud.json &&
-      gcloud auth activate-service-account $(jq -r ".client_email" /tmp/gcloud.json) --key-file=/tmp/gcloud.json &&
       gcloud container clusters get-credentials production --project=commercial-tribe --zone=us-east1-c;
     else
-      echo $GCLOUD_ENCODED_STAGING_CREDS | base64 -d > /tmp/gcloud.json &&
-      gcloud auth activate-service-account $(jq -r ".client_email" /tmp/gcloud.json) --key-file=/tmp/gcloud.json &&
       gcloud container clusters get-credentials staging --project=commercial-tribe-staging --zone=us-central1-a;
     fi
 
   # Install and configure kubectl
   - CLOUDSDK_CORE_DISABLE_PROMPTS=true sudo gcloud components update kubectl --version 142.0.0
   - export PATH=/usr/lib/google-cloud-sdk/bin:$PATH
   - sudo chown -R $USER /home/travis/.config/gcloud
-
-  # Authorize docker for access to gcloud
-  - gcloud docker --authorize-only
 deploy:
   - provider: script
     script: ./build-and-push.sh

deploy.sh

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
 kubectl --context="$1" --namespace="$2" apply -Rf=./k8s --force
+kubectl --context="$1" --namespace="$2" delete pods -l name=redis-nodes

k8s/redis-node-statefulset.yaml

@@ -29,6 +29,10 @@ spec:
               mountPath: /data
             - name: redis-config
               mountPath: /config
+          resources:
+            requests:
+              cpu: 100m
+              memory: 1Gi
           livenessProbe: &healthcheck
             exec:
               command: [ "redis-cli", "ping" ]
@@ -42,6 +46,10 @@ spec:
           ports:
             - name: sentinel
               containerPort: 26379
+          resources:
+            requests:
+              cpu: 25m
+              memory: 50mi
           livenessProbe: &healthcheck
             exec:
               command: [ "redis-cli", "-p", "26379", "ping" ]
@@ -63,6 +71,10 @@ spec:
           readinessProbe:
             exec:
               command: [ "cat", "booted" ]
+          resources:
+            requests:
+              cpu: 25m
+              memory: 50mi
 
       volumes:
         - name: pod-info
@@ -79,7 +91,7 @@ spec:
         name: data
         annotations:
           volume.beta.kubernetes.io/storage-class: "ssd"
-          gcp-auto-snapshot: "true"
+          gcp-auto-backup: "yes"
       spec:
         accessModes: [ "ReadWriteOnce" ]
         resources: