re-work doc for odo link corrections

Author: ajm01

examples/java_ol_postgresql_odo/README.md

@@ -94,17 +94,18 @@ After the instalation completes via the Operator Hub, please follow the instruct
 #### Create a namespace called `service-binding-demo` from the pgo CLI
 > What is the pgo CLI? The pgo cli is a terminal command line interface for the Crunchy PostgreSQL Operator - it allows you to create namespaces and database instances that will be managed by the Crunchy PostgreSQL Operator. Then pgo CLI was installed as part of the Crunchy PostgreSQL installation process that you followed earlier.
 
-The application and the DB needs a namespace to live in so let's create one for them using the pgo CLI:
+[comment]: <> (The application and the DB needs a namespace to live in so let's create one for them using the pgo CLI:)
+
+[comment]: <> (```shell)
+[comment]: <> (pgo create namespace service-binding-demo)
+[comment]: <> (```)
 
-```shell
-pgo create namespace service-binding-demo
-```
 #### Create a database cluster instance called `my-demo-db` from the pgo CLI
 
-Use the pgo CLI to create a db cluster instance in the namespace you created in the previous command. This instance will be a postgreSQL db managed by the Crunchy PostgreSQL Operator.
+Use the pgo CLI to create a db cluster instance in the pgo namespace you created in the previous command. This instance will be a postgreSQL db managed by the Crunchy PostgreSQL Operator.
 
 ```shell
-pgo create cluster my-demo-db -n service-binding-demo
+pgo create cluster my-demo-db -n pgo
 ```
 
 #### Import the demo Java MicroService JPA application
@@ -175,8 +176,8 @@ You will see a fully formed URL that can be used in a web browser
 ```shell
 $ odo url list
 Found the following URLs for component myjfstesingapp
-NAME                    STATE      URL                                                                                   PORT     SECURE     KIND
-myjfstesingapp-9080     Pushed     http://myjfstesingapp-9080-myjfstesingapp-jfstesting.apps.slobbed.os.fyre.ibm.com     9080     false      route
+NAME     STATE      URL                                                 PORT     SECURE     KIND
+ep1      Pushed     http://ep1-jpa-pgo.apps.slobbed.os.fyre.ibm.com     9080     false      route
 ```
 
 Use URL to navigate to the CreatePerson.xhtml data entry page and enter requested data, clicking on the "Save" button when complete
@@ -188,39 +189,21 @@ Note that the entry of any data does not result in the data being displayed when
 
 Now, the only thing that remains is to connect the DB and the application. We will use odo to create a link to the Service Binding Operator and will manually configure the resulting Service Binding Request to 'magically' do the connection for us.
 
-Display the services available to odo:
-```shell
-> odo catalog list services
-```
-
-You will see an entry for the Service Binding Operator displayed:
-
-```shell
-> odo catalog list services
-Operators available in the cluster
-NAME                                    CRDs
-service-binding-operator.v0.1.1-352     ServiceBindingRequest
->
-```
-use odo to create an odo service for the Service Binding Operator by entering the previous result in the following format: `<NAME>/<CRDs>`
-```shell
-> odo service create service-binding-operator.v0.1.1-352/ServiceBindingRequest
-```
-push this service instance to the cluster
-```shell
-> odo push
-```
-List this service
+List the services available
 ```shell
 > odo service list
-NAME                                                                                       AGE
-ServiceBindingRequest/example-servicebindingrequest                                        168h18m3s
+NAME                                  AGE
+Pgcluster/example                     1154h25m9s
+Pgcluster/my-demo-db                  2h30m33s
+Pgtask/backrest-backup-my-demo-db     2h28m8s
+Pgtask/my-demo-db-createcluster       2h30m33s
+Pgtask/my-demo-db-stanza-create       2h28m47s
 >
 ```
-Create a Service Binding Request between the application and the database using the Service Binding Operator service created in the previous step
+Create a Service Binding Request between the application and the database using the Pgcluster service for the DB
 
 ```shell
-> odo link ServiceBindingRequest/example-servicebindingrequest
+> odo link Pgcluster/my-demo-db
 ```
 
 push this link to the cluster
@@ -232,12 +215,12 @@ You have now created a Service Binding Request object in the namespace on behalf
 
 You can see this Service Binding Request via kubectl
 ```shell
-> kubectl get servicebindingrequest jpa-servicebindingrequest-example-servicebindingrequest
-NAME                                                      AGE
-jpa-servicebindingrequest-example-servicebindingrequest   3m12s
+>  kubectl get servicebindingrequest
+NAME                       AGE
+jpa-pgcluster-my-demo-db   36m
 >
 ```
-Or, alternatively, you can inspect the SBR via the OpenShift console in Administrator view by navigating to Operators > Installed Operators > Service Binding Operator and clicking on the Service Binding Request tab. Select the Service Binding Request Instance named `mysboproj-servicebindingrequest-example-servicebindingrequest`
+Or, alternatively, you can inspect the SBR via the OpenShift console in Administrator view by navigating to Operators > Installed Operators > Service Binding Operator and clicking on the Service Binding Request tab. Select the Service Binding Request Instance named `jpa-pgcluster-my-demo-db`
 
 #### Manually configure YAML files
 
@@ -410,11 +393,11 @@ Replace the `backingServiceSelector` block with the following YAML snippet:
 ```
 Complete YAML file once updated:
 ```yaml
-apiVersion: apps.OpenShift.io/v1alpha1
+apiVersion: apps.openshift.io/v1alpha1
 kind: ServiceBindingRequest
 metadata:
   selfLink: >-
-    /apis/apps.OpenShift.io/v1alpha1/namespaces/readmeapp/servicebindingrequests/mysboproj-servicebindingrequest-example-servicebindingrequest
+    /apis/apps.openshift.io/v1alpha1/namespaces/readmeapp/servicebindingrequests/mysboproj-servicebindingrequest-example-servicebindingrequest
   resourceVersion: '114116646'
   name: mysboproj-servicebindingrequest-example-servicebindingrequest
   uid: 20983d16-59f2-4b9b-ae56-e3371480821f
@@ -427,7 +410,7 @@ metadata:
       name: mysboproj
       uid: e3ca87f2-0208-4b00-82bb-db4345f834dd
   finalizers:
-    - finalizer.servicebindingrequest.OpenShift.io
+    - finalizer.servicebindingrequest.openshift.io
 spec:
   applicationSelector:
     group: apps
@@ -456,15 +439,15 @@ status:
 
 Save and re-load this YAML file.
 
-You have now created an intermediate secret object called `mysboproj-servicebindingrequest-example-servicebindingrequest` in the cluster that can be used by your application. You can see this secret via kubectl
+You have now created an intermediate secret object called `jpa-pgcluster-my-demo-db` in the cluster that can be used by your application. You can see this secret via kubectl
 
 ```shell
-kubectl get secret mysboproj-servicebindingrequest-example-servicebindingrequest
-NAME                                                            TYPE     DATA   AGE
-mysboproj-servicebindingrequest-example-servicebindingrequest   Opaque   5      13m
+kubectl get secret jpa-pgcluster-my-demo-db
+NAME                       TYPE     DATA   AGE
+jpa-pgcluster-my-demo-db   Opaque   5      13m
 >
 ```
-Or, alternatively, you can inspect the new intermediate secret via the OpenShift console in Administrator view by navigating to Workloads > Secrets and clicking on the secret named `mysboproj-servicebindingrequest-example-servicebindingrequest` Notice it contains 5 pieces of data all related to the connection information for your PostgreSQL database instance.
+Or, alternatively, you can inspect the new intermediate secret via the OpenShift console in Administrator view by navigating to Workloads > Secrets and clicking on the secret named `jpa-pgcluster-my-demo-db` Notice it contains 5 pieces of data all related to the connection information for your PostgreSQL database instance.
 
 Re-deploy the applications using odo
 ```shell