README updatges and cloud specific skupper config

Author: kameshsampath

README.adoc

@@ -34,11 +34,14 @@ The following table shows the cloud and what components gets installed on each o
 [cols="<2,^1,^1,^1", options="header"]
 |===
 | Component | Cloud-1  |  Cloud-2 | Cloud-3
+| Cloud Provider  | gcp  |  aws | azr
 | Backend   | &#x2713;  | &#x2713;  | &#x2713;
 | Frontend  | &#x2713;  | &#x274C; | &#x274C;
 | Generate Site Token(`token.yaml`)  | &#x2713;  | &#x274C; | &#x274C;
 |===
 
+NOTE: You can use any cloud provider for any OpenShift4 supported cloud, the gcp/aws/azr is used in this example.
+
 Before the `backend` or `frontend` applications are deployed, execute the following on *each cloud*:
 
 [source,bash]
@@ -47,10 +50,60 @@ cd $HYBRID_CLOUD_HOME
 oc apply -k k8s/core
 oc project hybrid-cloud-demo
 oc apply -k k8s/rbac
-oc apply -k k8s/skupper
 ----
 
-Wait for skupper deployments to be ready:
+=== Cloud-1(gcp)
+
+=== Add Image Streams
+
+[source,bash]
+----
+oc import-image hybrid-cloud-backend --confirm --all --from quay.io/rhdevelopers/hybrid-cloud-demo-backend
+# set local lookup policy
+oc set image-lookup hybrid-cloud-backend
+oc import-image hybrid-cloud-frontend --confirm --all --from quay.io/rhdevelopers/hybrid-cloud-demo-frontend
+# set local lookup policy
+oc set image-lookup hybrid-cloud-frontend
+----
+
+[source,bash]
+----
+oc apply -k k8s/skupper/gcp
+----
+
+=== Cloud-2(aws)
+
+=== Add Image Streams
+
+[source,bash]
+----
+oc import-image hybrid-cloud-backend --confirm --all --from quay.io/rhdevelopers/hybrid-cloud-demo-backend
+# set local lookup policy
+oc set image-lookup hybrid-cloud-backend
+----
+
+[source,bash]
+----
+oc apply -k k8s/skupper/aws
+----
+
+=== Cloud-3(azr)
+
+=== Add Image Streams
+
+[source,bash]
+----
+oc import-image hybrid-cloud-backend --confirm --all --from quay.io/rhdevelopers/hybrid-cloud-demo-backend
+# set local lookup policy
+oc set image-lookup hybrid-cloud-backend
+----
+
+[source,bash]
+----
+oc apply -k k8s/skupper/azr
+----
+
+Run the following commands on *Cloud-1*, *Cloud-2* and *Cloud-3* to wait for skupper deployments to be ready:
 
 [source,bash]
 ----
@@ -125,25 +178,30 @@ On *Cloud-1*, create the following Kubenretes Secret:
 
 [source,bash]
 ----
-oc create -n hybrid-cloud -f k8s/van/site-token.yaml
+skupper connection-token $HYBRID_CLOUD_HOME/token.yaml
 ----
 
-The skupper controller will update the secret *site-token* with TLS details that will be used in other clouds *Cloud-2* and *Cloud-3* to connect the clouds using _Virtual Application Network(VAN)_. 
+The `token.yaml` will be used in other clouds *Cloud-2* and *Cloud-3* to connect the clouds using _Virtual Application Network(VAN)_. 
 
-Retrieve the site token from *Cloud-1* using:
+
+To connect *Cloud-2* and *Cloud-3* with *Cloud-1*, run the following command on *Cloud-2* and *Cloud-3*:
+
+==== Cloud-2
+
+Make sure the *Cloud-2* starts to spill over after *4* requests in queue:
 
 [source,bash]
 ----
-oc get secret -n hybrid-cloud  site-token -o yaml > $HYBRID_CLOUD_HOME/token.yaml
+skupper connect --connection-name=cloud-1 --cost 4 $HYBRID_CLOUD_HOME/token.yaml
 ----
 
-IMPORTANT: You don't need to run the following commands on the *Cloud-1* as it already has the token.
+==== Cloud-3
 
-To connect *Cloud-2* and *Cloud-3* with *Cloud-1*, run the following command on *Cloud-2* and *Cloud-3*:
+Make sure the *Cloud-3* starts to spill over after *2* requests in queue:
 
 [source,bash]
 ----
-oc create -f $HYBRID_CLOUD_HOME/token.yaml
+skupper connect --connection-name=cloud-1 --cost 2 $HYBRID_CLOUD_HOME/token.yaml
 ----
 
 === Verify Status

cluster/project/playbook.yml

@@ -20,7 +20,7 @@
 #         msg: "Test over"
 
 - name: "Hybrid Cloud Demo::Prepare for Play"
-  hosts: azr
+  hosts: all
   connection: local
 
   vars:
@@ -41,13 +41,13 @@
          k8s_auth_api_key: "{{ k8s_auth_results.k8s_auth.api_key }}"
 
 - name: "Hybrid Cloud Demo::Configure, Setup and Deploy"
-  hosts: azr
+  hosts: all
   connection: local
 
   vars:
     ansible_python_interpreter: '{{ ansible_playbook_python }}'
     verify_certs: False
-    install_operators: False
+    install_operators: True
     ocp_version: 4.5.6
     download_clients: False
     deploy_serverless: True
@@ -57,7 +57,7 @@
     argocd_manifests_dir: argocd
     # The name of the Argo CD CR - default from kameshsampath.openshift_app_spices is argocd-openshift-oauth
     argocd_cr_name: argocd-openshift-oauth
-    htpasswdidp_name: workshopper
+    htpasswdidp_name: htpasswdidp
     users:
       create: True
       start: 0

cluster/project/roles/hybrid_cloud_demo/tasks/main.yml

@@ -5,6 +5,7 @@
 - include_tasks: tektoncd_add_tasks.yml
   tags:
     - tektoncd
+  
 
 - include_tasks: argocd_apps.yml
   tags:

k8s/skupper/kustomization.yaml k8s/skupper/aws/kustomization.yaml

@@ -1,13 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-# Adds namespace to all resources.
-namespace: hybrid-cloud-demo
-
-# Adds hybrid-cloud-demo label to all resources.
-commonLabels:
-  app.kubernetes.io/part-of: hybrid-cloud-demo
-
 generatorOptions:
   disableNameSuffixHash: true
 
@@ -21,10 +14,9 @@ configMapGenerator:
       - console-password="bugs"
       - console-user="bunny"
       - edge="false"
-      - name=hybrid-cloud-skupper
+      - name=hybrid-cloud-aws
       - router-console="true"
       - service-controller="true"
       - service-sync="true"
-
-resources:
-  - controller.yaml
+bases:
+  - ../base

k8s/skupper/azr/kustomization.yaml

@@ -0,0 +1,22 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+configMapGenerator:
+  - name: skupper-site
+    behavior: create
+    literals:
+      - cluster-local="false"
+      - console="true"
+      - console-authentication="openshift"
+      - console-password="bugs"
+      - console-user="bunny"
+      - edge="false"
+      - name=hybrid-cloud-azr
+      - router-console="true"
+      - service-controller="true"
+      - service-sync="true"
+bases:
+  - ../base

k8s/skupper/controller.yaml k8s/skupper/base/controller.yaml

@@ -18,12 +18,11 @@ spec:
       serviceAccountName: skupper-site-controller
       containers:
         - name: site-controller
-          image: quay.io/skupper/site-controller:0.3
+          image: quay.io/gordons/site-controller:0.3.2
           env:
             - name: WATCH_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SKUPPER_SERVICE_CONTROLLER_IMAGE
-              #value: quay.io/skupper/service-controller:0.3
-              value: quay.io/gordons/service-controller:0.3.2
+              value: quay.io/skupper/service-controller:0.3

k8s/skupper/base/kustomization.yaml

@@ -0,0 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+# Adds namespace to all resources.
+namespace: hybrid-cloud-demo
+
+# Adds hybrid-cloud-demo label to all resources.
+commonLabels:
+  app.kubernetes.io/part-of: hybrid-cloud-demo
+
+resources:
+  - controller.yaml

k8s/skupper/gcp/kustomization.yaml

@@ -0,0 +1,22 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+configMapGenerator:
+  - name: skupper-site
+    behavior: create
+    literals:
+      - cluster-local="false"
+      - console="true"
+      - console-authentication="openshift"
+      - console-password="bugs"
+      - console-user="bunny"
+      - edge="false"
+      - name=hybrid-cloud-gcp
+      - router-console="true"
+      - service-controller="true"
+      - service-sync="true"
+bases:
+  - ../base

k8s/van/site-token.yaml

@@ -4,4 +4,6 @@ kind: Secret
 metadata:
   labels:
     skupper.io/type: connection-token-request
+    # only allow 5 outstanding requests, before spillover
+    skupper.io/cost: "5"
   name: site-token