Merge pull request #51 from GoogleCloudPlatform/gke-per-test

Add a GKE-per-test method
GoogleCloudPlatform · Apr 9, 2019 · 731bb56 · 731bb56
2 parents 6e833db + a0e984f
commit 731bb56
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 24 deletions.
diff --git a/cloudbuild.gke-per-test.yaml b/cloudbuild.gke-per-test.yaml
@@ -0,0 +1,148 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+steps:
+
+- id: 'create cluster'
+  name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args: 
+    - '-c'
+    - |
+      # capture the cluster name to be created
+      # (it will be used again for the deletion)
+      echo "test-$(date +%s)" > _cluster-name
+      gcloud container clusters create $(cat _cluster-name)
+  waitFor: ['-'] # start immediately
+
+- id: 'compile web app'
+  name: 'gcr.io/cloud-builders/npm'
+  dir: 'web'
+  args: ['install']
+  waitFor: ['-']
+
+- id: 'web app unit tests'
+  name: 'gcr.io/cloud-builders/npm'
+  dir: 'web'
+  args: ['test']
+  waitFor: ['compile web app']
+
+- id: 'build web'
+  name: 'gcr.io/cloud-builders/docker'
+  args: [
+    'build',
+    '--tag=web', 
+    '--tag=gcr.io/$PROJECT_ID/web',
+    '--cache-from', 'gcr.io/$PROJECT_ID/web:latest',
+    'web/.',
+  ]
+  waitFor: ['web app unit tests'] # start immediately
+
+- id: 'build db'
+  name: 'gcr.io/cloud-builders/docker'
+  args: [
+    'build',
+    '--tag=mysql',
+    '--tag=gcr.io/$PROJECT_ID/mysql',
+    '--cache-from', 'gcr.io/$PROJECT_ID/mysql:latest',
+    'mysql/.',
+  ]
+  env:
+  - "MYSQL_ROOT_PASSWORD=password"
+  waitFor: ['-'] # start immediately
+
+- id: 'push web'
+  name: 'gcr.io/cloud-builders/docker'
+  args: ['push', 'gcr.io/$PROJECT_ID/web']
+  waitFor: ['build web']
+
+- id: 'push db'
+  name: 'gcr.io/cloud-builders/docker'
+  args: ['push', 'gcr.io/$PROJECT_ID/mysql']
+  waitFor: ['build db']
+
+- id: 'patch k8s config'
+  name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args: ['-c','find k8s -type f | xargs sed -i "s/PROJECT_ID/$PROJECT_ID/g"']
+  waitFor: ['-']
+
+- id: 'deploy to staging'
+  name: 'gcr.io/cloud-builders/kubectl'
+  args: ['apply', '-f', 'k8s/',] 
+  waitFor: ['push web','push db','create cluster','patch k8s config']
+
+- id: 'get endpoint'
+  name: 'gcr.io/cloud-builders/kubectl'
+  entrypoint: 'bash'
+  args: 
+  - '-c'
+  - |
+    # determine which node port the service was exposed on
+    get_nodeport() {
+      kubectl get service cookieshop-web -o=jsonpath='{.spec.ports[0].nodePort}' 
+    }
+
+    until [[ -n "$(get_nodeport)" ]]; do
+        echo "querying for nodeport"
+        sleep 3
+    done
+
+    echo "$(get_nodeport)" > _nodeport # save port for use in next step
+
+    # grab the public IP of a random node
+    # (why do this instead of a load balancer? b/c it's faster to instantiate)
+    # (and doesn't require additional billable resources)
+    # (we can reasonably expect the node to be durable enough to last until the test completes)
+    get_nodeip() {
+      kubectl get nodes --output jsonpath='{.items[0].status.addresses[?(@.type=="ExternalIP")].address}'
+    }
+
+    until [[ -n "$(get_nodeip)" ]]; do
+        echo "querying for nodeip"
+        sleep 3
+    done
+
+    echo $(get_nodeip) > _nodeip # save ip for use in next step
+
+  waitFor: ['deploy to staging']
+
+- id: 'integration tests'
+  name: 'gcr.io/cloud-builders/curl'
+  entrypoint: '/bin/bash'
+  args: 
+  - '-c'
+  - |
+    ### -r = retries; -i = interval; -k = keyword to search for ###
+    ./test/test-connection.sh -r 20 -i 3 -u http://$(cat _nodeip):$(cat _nodeport)
+    ./test/test-content.sh -r 20 -i 3 -u http://$(cat _nodeip):$(cat _nodeport) -k 'Chocolate Chip'
+  waitFor: ['get endpoint']
+
+- id: 'delete cluster'
+  name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args: 
+  - '-c'
+  - |
+    gcloud container clusters delete $(cat _cluster-name) --quiet # don't prompt for confirmation
+  waitFor: ['integration tests']
+
+options:
+  env:
+    # location/name of GKE cluster (used by all kubectl commands)
+    - CLOUDSDK_COMPUTE_ZONE=us-central1-a
+    - CLOUDSDK_CONTAINER_CLUSTER=staging
+
+timeout:
+  3600s
diff --git a/cloudbuild.gke.yaml b/cloudbuild.gke.yaml
@@ -1,3 +1,17 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 - id: 'compile web app'
   name: 'gcr.io/cloud-builders/npm'
@@ -50,10 +64,16 @@ steps:
   args: ['push', 'gcr.io/$PROJECT_ID/mysql']
   waitFor: ['build db']
 
+- id: 'patch k8s config'
+  name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args: ['-c','find k8s -type f | xargs sed -i "s/PROJECT_ID/$PROJECT_ID/g"']
+  waitFor: ['-']
+
 - id: 'deploy to staging'
   name: 'gcr.io/cloud-builders/kubectl'
   args: ['apply', '-f', 'k8s/', '--namespace=test-$BUILD_ID'] 
-  waitFor: ['push web','push db']
+  waitFor: ['push web','push db','patch k8s config']
 
 - id: 'get endpoint'
   name: 'gcr.io/cloud-builders/kubectl'

diff --git a/cloudbuild.meta.yaml b/cloudbuild.meta.yaml
@@ -1,7 +1,22 @@
-# verify that all three testing methods work
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# verify that all testing methods work
 
 steps:
-- name: 'gcr.io/cloud-builders/gcloud'
+- id: 'Docker Compose'
+  name: 'gcr.io/cloud-builders/gcloud'
   args: [
       'builds', 
       'submit',
@@ -10,7 +25,8 @@ steps:
   ]
   waitFor: ['-']
 
-- name: 'gcr.io/cloud-builders/gcloud'
+- id: 'GKE staging cluster'
+  name: 'gcr.io/cloud-builders/gcloud'
   args: [
       'builds', 
       'submit',
@@ -19,7 +35,8 @@ steps:
   ]
   waitFor: ['-']
 
-- name: 'gcr.io/cloud-builders/gcloud'
+- id: 'Single-node Kubernetes'
+  name: 'gcr.io/cloud-builders/gcloud'
   args: [
       'builds', 
       'submit',
@@ -28,5 +45,15 @@ steps:
   ]
   waitFor: ['-']
 
+- id: 'GKE cluster per test'
+  name: 'gcr.io/cloud-builders/gcloud'
+  args: [
+      'builds', 
+      'submit',
+      '--config=cloudbuild.gke-per-test.yaml',
+      '.'
+  ]
+  waitFor: ['-']
+
 timeout:
   3600s
diff --git a/cloudbuild.vm.yaml b/cloudbuild.vm.yaml
@@ -1,3 +1,17 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 steps:
 
 # 1. terraform: make [self-destructing] VM [with microk8s]
@@ -24,6 +38,12 @@ steps:
   ]
   waitFor: ['init terraform']
 
+- id: 'patch k8s config'
+  name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  args: ['-c','find k8s -type f | xargs sed -i "s/PROJECT_ID/$PROJECT_ID/g"']
+  waitFor: ['-']
+
 - id: 'patch kubeconfig'
   name: 'gcr.io/$PROJECT_ID/terraform'
   entrypoint: '/bin/bash'

diff --git a/k8s/db.yaml b/k8s/db.yaml
@@ -33,7 +33,7 @@ spec:
       containers:
       - name: mysql
         # Dev TODO: add your project id here
-        image: gcr.io/PROJECT-ID/mysql:latest
+        image: gcr.io/PROJECT_ID/mysql:latest
         env:
           - name: MYSQL_ROOT_PASSWORD
             value: "password"

diff --git a/k8s/service-web.yaml b/k8s/service-web.yaml
@@ -11,23 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-# kind: Service
-# apiVersion: v1
-# metadata:
-#   name: cookieshop-web
-#   labels:
-#     app: cookieshop
-#     role: web
-# spec:
-#   type: NodePort
-#   ports:
-#   - port: 3000
-#     targetPort: 3000
-#   selector:
-#     role: web
-#     app: cookieshop
----
 kind: Service
 apiVersion: v1
 metadata:

diff --git a/k8s/web.yaml b/k8s/web.yaml
@@ -33,7 +33,7 @@ spec:
       containers:
       - name: web
         # Dev TODO: add your project id here
-        image: gcr.io/PROJECT-ID/web:latest
+        image: gcr.io/PROJECT_ID/web:latest
         env:
         - name: DB_HOST
           value: cookieshop-db