Update CI with recent changes

This commit updates CI with the recent changes made to the
deployment steps.

Author: AnthonyAmanse

.travis.yml

@@ -13,13 +13,10 @@ notifications:
 services:
   - docker
 
-matrix:
-  fast_finish: true
-
 before_install:
   - sudo apt-get install shellcheck
   - pip install -U -r test-requirements.txt
-  - git clone https://github.com/IBM/pattern-ci
+  - git clone --single-branch --depth=1 --branch update-minikube https://github.com/IBM/pattern-ci
 
 before_script:
   - "./pattern-ci/tests/shellcheck-lint.sh"

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/IBM/Scalable-WordPress-deployment-on-Kubernetes.svg?branch=master)](https://travis-ci.org/IBM/Scalable-WordPress-deployment-on-Kubernetes)
+
 # Scalable WordPress deployment on Kubernetes Cluster
 
 This journey showcases the full power of Kubernetes clusters and shows how can we deploy the world's most popular website framework on top of world's most popular container orchestration platform. We provide a full roadmap for hosting WordPress on a Kubernetes Cluster. Each component runs in a separate container or group of containers.

kustomization.yaml

@@ -1,7 +1,8 @@
+---
 secretGenerator:
-- name: mysql-pass
-  files:
-  - password.txt
+  - name: mysql-pass
+    files:
+      - password.txt
 resources:
   - local-volumes.yaml
   - mysql-deployment.yaml

mysql-deployment.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -25,7 +26,7 @@ spec:
     requests:
       storage: 20Gi
 ---
-apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
+apiVersion: apps/v1    # for versions before 1.9.0 use apps/v1beta2
 kind: Deployment
 metadata:
   name: wordpress-mysql
@@ -45,21 +46,21 @@ spec:
         tier: mysql
     spec:
       containers:
-      - image: mysql:5.6
-        name: mysql
-        env:
-        - name: MYSQL_ROOT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: mysql-pass
-              key: password.txt
-        ports:
-        - containerPort: 3306
+        - image: mysql:5.6
           name: mysql
-        volumeMounts:
-        - name: mysql-persistent-storage
-          mountPath: /var/lib/mysql
+          env:
+            - name: MYSQL_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mysql-pass
+                  key: password.txt
+          ports:
+            - containerPort: 3306
+              name: mysql
+          volumeMounts:
+            - name: mysql-persistent-storage
+              mountPath: /var/lib/mysql
       volumes:
-      - name: mysql-persistent-storage
-        persistentVolumeClaim:
-          claimName: mysql-pv-claim
+        - name: mysql-persistent-storage
+          persistentVolumeClaim:
+            claimName: mysql-pv-claim

scripts/deploy-to-bluemix/bx_login.sh

@@ -1,9 +1,4 @@
 #!/bin/bash
 echo 'password' > password.txt
 tr -d '\n' <password.txt >.strippedpassword.txt && mv .strippedpassword.txt password.txt
-kubectl create -f local-volumes.yaml
-kubectl create secret generic mysql-pass --from-file=password.txt
-kubectl create -f mysql-deployment.yaml
-kubectl create -f wordpress-deployment.yaml
-kubectl get nodes
-kubectl get svc wordpress
+kubectl apply -k ./

scripts/deploy-to-bluemix/deploy.sh

@@ -18,11 +18,14 @@ kubectl_deploy() {
         echo "...$i * 10 seconds elapsed..."
         ((i++))
     done
+    kubectl get pods
     echo "All pods are running"
 }
 
 verify_deploy(){
-    echo "Verifying deployment was successful"
+    echo "Verifying deployment..."
+    kubectl get services
+    sleep 15
     if ! curl -sS "$(minikube service --url wordpress)"; then
         test_failed "$0"
     fi

scripts/deploy-to-bluemix/install_bx.sh

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -25,7 +26,7 @@ spec:
     requests:
       storage: 20Gi
 ---
-apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
+apiVersion: apps/v1    # for versions before 1.9.0 use apps/v1beta2
 kind: Deployment
 metadata:
   name: wordpress-c
@@ -45,22 +46,22 @@ spec:
         tier: frontend-c
     spec:
       containers:
-      - image: wordpress:latest
-        name: wordpress-c
-        env:
-        - name: WORDPRESS_DB_HOST
-          value: <<ENTER YOUR DB HOST>>:<<ENTER DB PORT>>
-        - name: WORDPRESS_DB_USER
-          value: <<ENTER YOUR DB USERNAME>>
-        - name: WORDPRESS_DB_PASSWORD
-          value: <<ENTER YOUR DB PASSWORD FROM COMPOSE>>
-        ports:
-        - containerPort: 80
+        - image: wordpress:latest
           name: wordpress-c
-        volumeMounts:
-        - name: wordpress-c-persistent-storage
-          mountPath: /var/www/html
+          env:
+            - name: WORDPRESS_DB_HOST
+              value: <<ENTER YOUR DB HOST>>:<<ENTER DB PORT>>
+            - name: WORDPRESS_DB_USER
+              value: <<ENTER YOUR DB USERNAME>>
+            - name: WORDPRESS_DB_PASSWORD
+              value: <<ENTER YOUR DB PASSWORD FROM COMPOSE>>
+          ports:
+            - containerPort: 80
+              name: wordpress-c
+          volumeMounts:
+            - name: wordpress-c-persistent-storage
+              mountPath: /var/www/html
       volumes:
-      - name: wordpress-c-persistent-storage
-        persistentVolumeClaim:
-          claimName: wpc-pv-claim
+        - name: wordpress-c-persistent-storage
+          persistentVolumeClaim:
+            claimName: wpc-pv-claim

scripts/quickstart.sh

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -25,7 +26,7 @@ spec:
     requests:
       storage: 20Gi
 ---
-apiVersion: apps/v1 #versions before 1.9.0 use apps/v1beta2
+apiVersion: apps/v1   # versions before 1.9.0 use apps/v1beta2
 kind: Deployment
 metadata:
   name: wordpress
@@ -45,23 +46,23 @@ spec:
         tier: frontend
     spec:
       containers:
-      - image: wordpress:latest
-        name: wordpress
-        env:
-        - name: WORDPRESS_DB_HOST
-          value: wordpress-mysql
-        - name: WORDPRESS_DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: mysql-pass
-              key: password.txt
-        ports:
-        - containerPort: 80
+        - image: wordpress:latest
           name: wordpress
-        volumeMounts:
-        - name: wordpress-persistent-storage
-          mountPath: /var/www/html
+          env:
+            - name: WORDPRESS_DB_HOST
+              value: wordpress-mysql
+            - name: WORDPRESS_DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mysql-pass
+                  key: password.txt
+          ports:
+            - containerPort: 80
+              name: wordpress
+          volumeMounts:
+            - name: wordpress-persistent-storage
+              mountPath: /var/www/html
       volumes:
-      - name: wordpress-persistent-storage
-        persistentVolumeClaim:
-          claimName: wp-pv-claim
+        - name: wordpress-persistent-storage
+          persistentVolumeClaim:
+            claimName: wp-pv-claim