minor updates for istio configs and context scraper

Author: dudash

Diff for: README.md

@@ -96,5 +96,5 @@ Apache 2.0.
 [1]: https://github.com/dudash/openshift-microservices/issues
 [2]: https://github.com/dudash/openshift-microservices/labels/discussion
 
-[openshift-heximage]: https://img.shields.io/badge/openshift-3.11-BB261A.svg
-[openshift-url]: https://docs.openshift.com/container-platform/3.11/welcome/index.html
+[openshift-heximage]: https://img.shields.io/badge/openshift-4.3-BB261A.svg
+[openshift-url]: https://docs.openshift.com/container-platform/4.3/welcome/index.html

Diff for: code/context-scraper/.gitignore

@@ -44,4 +44,9 @@ testem.log
 Thumbs.db
 
 # Mock API
-/api/node_modules
+/api/node_modules
+
+# nodeshift and odo
+tmp/*
+.odo/*
+.odo/odo-file-index.json

Diff for: code/context-scraper/README.md

@@ -58,12 +58,18 @@ In another terminal you can test with:
 $ http GET localhost:8080/scrape/custom_search?term==YOUR_TERM_HERE
 ```
 
-### Running on OpenShift
+### Deploy / Run / Test Local Code to OpenShift - The easy way 
+We can use odo to do our OpenShift deployments and iterations on code/test:
+```
+odo component create nodejs context-scraper --now
+```
+
+### Deploy / Run / Test Local Code to OpenShift - The complicated but configurable YAML way
 You can use a template to create all the build and deployment resources for OpenShift. Here's an example that overrides the defaults:
 ```bash
 oc new-app -f ../../deployment/install/microservices/openshift-configuration/context-scraper-fromsource.yaml \
     -p APPLICATION_NAME=context-scraper \
-    -p NODEJS_VERSION_TAG=8-RHOAR \
+    -p NODEJS_VERSION_TAG=12 \
     -p GIT_BRANCH=develop \
     -p GIT_URI=https://github.com/dudash/openshift-microservices.git
 ```
@@ -74,7 +80,7 @@ Note: the template uses S2I which pulls from git and builds the container image
 You can use [s2i][5] to easily build this into a container image. For example to use the OpenShift runtimes node.js as our base:
 ```bash
 rm -rf node_modules
-s2i build . registry.access.redhat.com/ubi7/nodejs-8 openshift-microservices-context-scraper --loglevel 3
+s2i build . registry.access.redhat.com/ubi8/nodejs-12 openshift-microservices-context-scraper --loglevel 3
 ```
 Note: we remove the node_modules to avoid conflicts during the build process
 

Diff for: code/context-scraper/package-lock.json

@@ -3,11 +3,12 @@ This folder contains instructions on how to configure and install dependencies o
 
 Some notes on configuration file paths:
 - `.s2i` folders will go in each microservice along with the code (because it's a service specific build-time config)
+- other openshift build-time resources can live with the microservice in a `.openshift` folder (if it has something to do with the build)
+- `.odo` folders are config we are currently considering developer specific (so currently `.gitignore'd`)
 - openshift/kubernetes resources required for running will live in `deployment/install/microservices/openshift-configuration/*.yaml`
 - istio resources will live in the folders `deployment/install/microservices/istio-configuration/*.yaml`
 - optional openshift resources for specific demo purposes can live in `deployment/demos/DEMOXYZ/openshift-configuration/*.yaml`
 - optional istio resources for specific demo purposes can live in `deployment/demos/DEMOXYZ/istio-configuration/*.yaml`
-- openshift build-time resources can live with the microservice in a `.openshift` folder (if it has something to do with the build)
 
 To get up and running you'll need to setup the platform dependencies on your cluster. Once those are available, follow the steps to install the application.
 

Diff for: deployment/install/README.md

@@ -1,2 +1,2 @@
 # Istio configuration
-The files in here configure the microservices demo app to leverage Istio capabilities as part of OpenShift. Note that OpenShift provides some additional capability beyond community Istio that might affect the config. Things like automatic route creation, this is outlined [in the docs](https://docs.openshift.com/container-platform/3.11/servicemesh-install/servicemesh-install.html#servicemesh-istio-comparison).
+The files in here configure the microservices demo app to leverage Istio capabilities as part of OpenShift. Note that OpenShift provides some additional capability beyond community Istio that might affect the config. Things like automatic route creation, this is outlined [in the docs](https://docs.openshift.com/container-platform/4.3/service_mesh/service_mesh_arch/ossm-vs-community.html).

Diff for: deployment/install/microservices/istio-configuration/README.md

@@ -1,5 +1,9 @@
 # These are a set of destination rules that can be used
 # as a simple base for more advanced demos to build upon
+#
+# you use destination rules to configure what happens to traffic (the destination itself is set in a virtual service)
+# Destination rules are applied after virtual service routing rules are evaluated
+# read more here: https://istio.io/docs/reference/config/networking/destination-rule/
 apiVersion: networking.istio.io/v1alpha3
 kind: DestinationRule
 metadata:
@@ -27,3 +31,10 @@ metadata:
   name: context-scraper
 spec:
   host: context-scraper
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: userprofile
+spec:
+  host: userprofile

Diff for: deployment/install/microservices/istio-configuration/destinationrules.yaml

@@ -11,8 +11,6 @@
 # around from domain to domain and cluster to cluster. You can easily scope it
 # to run with custom ingress by adding one or more explicit hosts in place of '*'.
 #
-# Also, OpenShift *should* automatically create routes for me based on this:
-# https://docs.openshift.com/container-platform/3.11/servicemesh-install/servicemesh-install.html#automatic-route-creation
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

Diff for: deployment/install/microservices/istio-configuration/ingress-gateway.yaml

@@ -1,5 +1,8 @@
 # These are a set of virtual service routes that can be used
 # as a simple base for more advanced demos to build upon
+#
+# A virtual service lets you configure how requests are routed to a service within the service mesh
+# They decouple where a client sends a request from the actual destination that processes the request
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:

Diff for: deployment/install/microservices/istio-configuration/virtual-services.yaml

@@ -43,6 +43,7 @@ objects:
     ports:
     - port: 8443
       targetPort: 8443
+      name: https
     selector:
       deploymentConfig: ${APPLICATION_NAME}
 - apiVersion: v1
@@ -57,6 +58,7 @@ objects:
     ports:
     - port: 5432
       targetPort: 5432
+      name: tcp-postgres
     selector:
       deploymentConfig: ${APPLICATION_NAME}-postgresql
 - apiVersion: v1

Diff for: deployment/install/microservices/openshift-configuration/auth-sso73-x509.yaml

@@ -32,9 +32,8 @@ objects:
     name: ${APPLICATION_NAME}
   spec:
     ports:
-    - name: 8080-tcp
+    - name: http
       port: 8080
-      protocol: TCP
       targetPort: 8080
     selector:
       deploymentconfig: ${APPLICATION_NAME}

Diff for: deployment/install/microservices/openshift-configuration/userprofile-fromsource-jvm.yaml

@@ -33,9 +33,8 @@ objects:
     name: ${APPLICATION_NAME}
   spec:
     ports:
-    - name: 8080-tcp
+    - name: http
       port: 8080
-      protocol: TCP
       targetPort: 8080
     selector:
       deploymentconfig: ${APPLICATION_NAME}
@@ -248,7 +247,7 @@ objects:
     name: '${DATABASE_SERVICE_NAME}'
   spec:
     ports:
-      - name: postgresql
+      - name: tcp-postgresql
         nodePort: 0
         port: 5432
         protocol: TCP

Diff for: deployment/install/microservices/openshift-configuration/userprofile-fromsource.yaml

@@ -30,9 +30,8 @@ objects:
     name: ${APPLICATION_NAME}
   spec:
     ports:
-    - name: 8080-tcp
+    - name: http
       port: 8080
-      protocol: TCP
       targetPort: 8080
     selector:
       deploymentconfig: ${APPLICATION_NAME}
@@ -170,7 +169,7 @@ objects:
     name: '${DATABASE_SERVICE_NAME}'
   spec:
     ports:
-      - name: postgresql
+      - name: tcp-postgresql
         nodePort: 0
         port: 5432
         protocol: TCP