diff --git a/_helpers/deploy-app.sh b/_helpers/deploy-app.sh index ef9d2d4..fd95aa6 100755 --- a/_helpers/deploy-app.sh +++ b/_helpers/deploy-app.sh @@ -101,7 +101,7 @@ do kubectl --context $cluster -n istio-system get service istio-ingressgateway # don't proceed until EXTERNAL-IP is set done -# Hipster Shop Installation +# microservices-demo (the Online Boutique) Installation # Retrieve a needed environment variable @@ -144,5 +144,5 @@ kubectl --context in-scope describe ingresses # After ~3 minutes, The application should be accessible at $DOMAIN_NAME curl -s -o /dev/null -I -w "%{http_code}" https://$DOMAIN_NAME # output should be 200 -curl -s https://$DOMAIN_NAME | grep -q "One-stop for Hipster Fashion" ; echo $? # output should be 0 +curl -s https://$DOMAIN_NAME | grep -q "Online Boutique" ; echo $? # output should be 0 curl -Is http://$DOMAIN_NAME | head -1 # output should be "HTTP/1.1 301 Moved Permanently" diff --git a/docs/deploy-application.md b/docs/deploy-application.md index 4b6e534..db7d0ee 100644 --- a/docs/deploy-application.md +++ b/docs/deploy-application.md @@ -1,4 +1,4 @@ -# Deploying the Microservices-Demo Application +# Deploying the microservices-demo (Online Boutique) Application This is a walkthrough of the steps included in `./_helpers/deploy-app.sh` @@ -10,9 +10,9 @@ This diagram illustrates the different projects that have been created and which ## Prepare Application Deployment -The application to be deployed here is named microservices-demo, which implements a mock ecommerce application called the [Hipster Store](https://github.com/GoogleCloudPlatform/microservices-demo) +The application to be deployed here is the [Online Boutique](https://github.com/GoogleCloudPlatform/microservices-demo), a mock e-commerce application. -In this section, we'll deploy a custom version of this Hipster Store that +In this section, we'll deploy a custom version of the Online Boutique that separates any microservices that interact with Cardholder Data (in-scope) from those that don't (out-of-scope). @@ -121,7 +121,7 @@ do done ``` -# Hipster Shop Installation +# microservices-demo Installation ## Retrieve a needed environment variable @@ -240,7 +240,7 @@ Once the certificate has been successfuly provisioned, the application should be ```sh curl -s -o /dev/null -I -w "%{http_code}" https://$DOMAIN_NAME # output should be 200 -curl -s http://$DOMAIN_NAME | grep -q "One-stop for Hipster Fashion" ; echo $? # output should be 0 +curl -s http://$DOMAIN_NAME | grep -q "Online Boutique" ; echo $? # output should be 0 ``` # Istio Implementation diff --git a/k8s/helm/in-scope-microservices/templates/deployments.yaml b/k8s/helm/in-scope-microservices/templates/deployments.yaml index 3a2bd64..c312b92 100644 --- a/k8s/helm/in-scope-microservices/templates/deployments.yaml +++ b/k8s/helm/in-scope-microservices/templates/deployments.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: server - image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/checkoutservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 5050 readinessProbe: @@ -142,7 +142,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/paymentservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/paymentservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 50051 env: diff --git a/k8s/helm/in-scope-microservices/values.yaml b/k8s/helm/in-scope-microservices/values.yaml index cc3aa59..fdaaf71 100644 --- a/k8s/helm/in-scope-microservices/values.yaml +++ b/k8s/helm/in-scope-microservices/values.yaml @@ -13,7 +13,8 @@ # limitations under the License. frontend_security_policy: frontend-application-security-policy -frontend_image: gcr.io/pci-gke-blueprint/microservices-demo/frontend:v0.1.4-2020-04-24-1414 +frontend_image: gcr.io/pci-gke-blueprint/microservices-demo/frontend:v0.2.0-2020-04-30-1728 +microservices_demo_version: v0.2.0 # Required to be supplied: # out_of_scope_ingress_gateway_ip_address: 172.16.4.9 diff --git a/k8s/helm/out-of-scope-microservices/templates/deployments.yaml b/k8s/helm/out-of-scope-microservices/templates/deployments.yaml index 702fe62..21ffe0c 100644 --- a/k8s/helm/out-of-scope-microservices/templates/deployments.yaml +++ b/k8s/helm/out-of-scope-microservices/templates/deployments.yaml @@ -28,7 +28,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/adservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/adservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 9555 env: @@ -70,7 +70,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/cartservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/cartservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 7070 env: @@ -113,7 +113,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/currencyservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/currencyservice:{{ .Values.microservices_demo_version }} ports: - name: grpc containerPort: 7000 @@ -150,7 +150,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/emailservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/emailservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 8080 readinessProbe: @@ -185,7 +185,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/productcatalogservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 3550 readinessProbe: @@ -222,7 +222,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/recommendationservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 8080 readinessProbe: @@ -259,7 +259,7 @@ spec: spec: containers: - name: server - image: gcr.io/google-samples/microservices-demo/shippingservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/shippingservice:{{ .Values.microservices_demo_version }} ports: - containerPort: 50051 readinessProbe: diff --git a/k8s/helm/out-of-scope-microservices/values.yaml b/k8s/helm/out-of-scope-microservices/values.yaml index f281b3a..09bae97 100644 --- a/k8s/helm/out-of-scope-microservices/values.yaml +++ b/k8s/helm/out-of-scope-microservices/values.yaml @@ -15,3 +15,5 @@ # Default values for out-of-scope-microservices. # This is a YAML-formatted file. # Declare variables to be passed into your templates. + +microservices_demo_version: v0.2.0 diff --git a/microservices-demo/frontend/build.sh b/microservices-demo/frontend/build.sh index ee48db7..f3e04a9 100755 --- a/microservices-demo/frontend/build.sh +++ b/microservices-demo/frontend/build.sh @@ -2,7 +2,7 @@ # Builds and pushes a customized frontend image -MICROSERVICES_DEMO_RELEASE_TAG="v0.1.4" +MICROSERVICES_DEMO_RELEASE_TAG="v0.2.0" MICROSERVICES_DEMO_REPOSITORY="git@github.com:GoogleCloudPlatform/microservices-demo.git" TAG="${MICROSERVICES_DEMO_RELEASE_TAG}-$(date +%Y-%m-%d-%H%M)" APP_NAME="microservices-demo/frontend"