Update Example README to include v2 and V3 helm commands (#427)

Author: Tim Middleton

examples/deployment/README.md

@@ -21,7 +21,7 @@ You can use `kubectl create` for any of the examples to install that one directl
 
 * [Prerequisites](#prerequisites)
   * [Coherence Operator Quick Start](#coherence-operator-quick-start) 
-  * [JDK and Maven Versions](#jdk-and-maven-versions) 
+  * [Software Versions](#software-versions) 
   * [Create the example namespace](#create-the-example-namespace)
   * [Clone the GitHub repository](#clone-the-github-repository)
   * [Install the Coherence Operator](#install-the-coherence-operator)
@@ -41,7 +41,7 @@ You can use `kubectl create` for any of the examples to install that one directl
 Ensure you have followed all the [Quick Start Guide](https://oracle.github.io/coherence-operator/docs/#/about/03_quickstart) including the
 prerequisites and have been able to successfully install the Coherence Operator and a Coherence Cluster.
 
-## JDK and Maven versions
+## Software Versions
 
 Ensure you have the following software installed:
 
@@ -50,6 +50,7 @@ Ensure you have the following software installed:
 * [Docker](https://docs.docker.com/install/) version 17.03+.
 * [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.12.0+ .
 * Access to a Kubernetes v1.12.0+ cluster.
+* [Helm](https://helm.sh/docs/intro/install/) version 3.2.4+ (2.14.3+ supported, see notes) 
 
 > Note: Ensure that your local Kubernetes is enabled. If you are running Docker using Docker Desktop, select Enable Kubernetes in the Settings menu.
 
@@ -95,7 +96,7 @@ This will result in the following Docker image being created which contains the
 artifacts to be use by all deployments.
 
 ```console
-deployment-example:3.0.0
+deployment-example:3.0.1
 ```   
 
 > Note: If you are running against a remote Kubernetes cluster, you need to tag and 
@@ -106,8 +107,14 @@ deployment-example:3.0.0
 
 Issue the following command to install the Coherence Operator:
 
+```bash 
+helm install --namespace coherence-example coherence-operator coherence/coherence-operator
+```
+
+> Note: for Helm version 2, use the following:
+
 ```bash
-helm install coherence/coherence-operator --version 3.0.0 --namespace coherence-example --name coherence-operator
+helm install coherence/coherence-operator --namespace coherence-example --name coherence-operator
 ```
 
 Confirm the operator is running:
@@ -262,7 +269,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: tmiddlet/deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 1
 ```
@@ -374,7 +381,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: tmiddlet/deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   application:
     main: com.oracle.coherence.examples.Main
@@ -643,6 +650,14 @@ install any of the examples above.
 
 ## Install Prometheus Operator
 
+1. Add the `stable` helm repository
+
+    ```bash
+   helm repo add stable https://kubernetes-charts.storage.googleapis.com/
+   
+   helm repo update 
+   ```
+
 1. Create Prometheus pre-requisites
 
     ```bash
@@ -666,6 +681,17 @@ install any of the examples above.
     > Note: If you have already installed Prometheus Operator before on this Kubernetes Cluster
     > then set `--set prometheusOperator.createCustomResource=false`.
 
+    Issue the following command to install the Prometheus Operator using Helm:
+    
+    ```bash
+    helm install --namespace coherence-example --version 8.13.9 \
+        --set grafana.enabled=true \
+        --set prometheusOperator.createCustomResource=true \
+        --values src/main/yaml/prometheus-values.yaml prometheus stable/prometheus-operator  
+    ```        
+   
+    > Note: for Helm version 2, use the following:
+    
     ```bash
     helm install --namespace coherence-example --version 8.13.9 \
         --set grafana.enabled=true --name prometheus \
@@ -736,21 +762,33 @@ in the `examples/bin/` directory.
 
 1.  Remove the Coherence Operator
 
+    ```bash
+    helm delete coherence-operator --namespace coherence-example
+    ```                                                         
+    
+    > For Helm version 2 use the following:
+                                                                                                                                                                                          
     ```bash
     helm delete coherence-operator --purge
     ```     
     
 1. Delete Prometheus Operator
 
    ```bash
-   helm delete prometheus --purge
+   helm delete prometheus --namespace coherence-example
    
    kubectl -n coherence-example delete -f src/main/yaml/grafana-datasource-config.yaml
    
    kubectl -n coherence-example delete configmap coherence-grafana-dashboards
    
    kubectl delete -f src/main/yaml/prometheus-rbac.yaml      
-   ```     
+   ```    
+   
+   > For Helm version 2 use the following:
+   
+   ```bash
+   helm delete prometheus --purge
+   ```                                                                                                                                                                                                                                                                                                                                                                 
    
    > Note: You can optionally delete the Prometheus Operator Custom Resource Definitions
    > (CRD's) if you are not going to install Prometheus Operator again. 

examples/deployment/src/main/yaml/example-cluster-app.yaml

@@ -25,7 +25,7 @@ spec:
     cacheConfig: storage-cache-config.xml
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 3
 ---
@@ -52,7 +52,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 1
 ---
@@ -79,8 +79,8 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   application:
     main: com.oracle.coherence.examples.Main
-  replicas: 1
+  replicas: 1

examples/deployment/src/main/yaml/example-cluster-persistence.yaml

@@ -33,7 +33,7 @@ spec:
         resources:
           requests:
             storage: 1Gi
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 3
 ---
@@ -60,7 +60,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 1
 ---
@@ -87,7 +87,7 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   application:
     main: com.oracle.coherence.examples.Main

examples/deployment/src/main/yaml/example-cluster-proxy.yaml

@@ -25,7 +25,7 @@ spec:
     cacheConfig: storage-cache-config.xml
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 3
 ---
@@ -52,6 +52,6 @@ spec:
     storageEnabled: false
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 1

examples/deployment/src/main/yaml/example-cluster.yaml

@@ -25,6 +25,6 @@ spec:
     cacheConfig: storage-cache-config.xml
     metrics:
       enabled: true
-  image: deployment-example:3.0.0
+  image: deployment-example:3.0.1
   imagePullPolicy: Always
   replicas: 3