refactor: Use colors service for Traffic dist

- Service deployment will not describe revisions
- Traffic distribution will use blue-green-canary image to show revs/traffic
- Added OpenShift videos

Author: kameshsampath

.github/workflows/main.yml

@@ -2,43 +2,28 @@ name: Knative Tutorial
 
 on:
   push:
-    branches: 
-      - release/1.x
+    tags:
+      - "v1.13"
 env:
-  SITE_DIR: 'gh-pages'
+  SITE_DIR: "gh-pages"
+
 jobs:
-  build_site:
+  buildAnDeploySite:
     name: "Build site with Antora"
-    runs-on: [ubuntu-latest]
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: "Generate site using antora site action"
-        uses: kameshsampath/antora-site-action@master
+        uses: kameshsampath/antora-site-action@v0.2.4
         with:
-         antora_playbook: site.yml
-      - name: "Upload generated site"
-        uses: actions/upload-artifact@v1.0.0
+          antora_playbook: site.yml
+      - name: Deploy Site
+        id: deploy_site
+        uses: peaceiris/actions-gh-pages@v3
         with:
-          name: site
-          path: "${{ github.workspace }}/${{ env.SITE_DIR }}"
-  deploy_site:
-    runs-on: [ubuntu-latest]
-    needs: [build_site]
-    name: "Deploy GitHub Pages"
-    steps:
-     - name: Checkout
-       uses: actions/checkout@v2
-     - name: Download generated site
-       uses: actions/download-artifact@v1
-       with:
-         name: site
-         path: "${{ github.workspace }}/${{ env.SITE_DIR }}"
-     - name: Deploy to GitHub Pages
-       uses: JamesIves/github-pages-deploy-action@3.2.1
-       with:
-        # ACCESS_TOKEN: # optional
-        GITHUB_TOKEN: "${{ github.token}}"
-        FOLDER: "${{ env.SITE_DIR }}"
-        BRANCH: 'gh-pages'
-        COMMIT_MESSAGE: "[CI] Publish Documentation for ${{ github.sha }}"
+          deploy_key: "${{ secrets.TKN_STAGING_SITE_DEPLOY }}"
+          publish_dir: "${{ env.SITE_DIR }}"
+          publish_branch: "gh-pages"          
+          full_commit_message: "[CI]${{ github.event.head_commit.message }}"
+     

CONTRIBUTING.md

@@ -35,4 +35,4 @@ Now you are all set,
 - Prepare your changes in the respective documentation repository
 - Send the PR to respective repositories listed above
 
-We try to follow the Git commit messages using <http://karma-runner.github.io/4.0/dev/git-commit-msg.html> and thats not a hard rule ;)
+We try to follow the Git commit messages using <https://www.conventionalcommits.org/en/v1.0.0/> and thats not a hard rule ;)

dev-site.yml

@@ -22,22 +22,23 @@ content:
 asciidoc:
   attributes:
     tutorial-namespace: knativetutorial
-    branch: staging
+    branch: master
     workshop-domain: guru.devx.red
-    minikube-version: v1.14.1
+    minikube-version:  v1.17.1
     openshift-version: v4.6
     kubernetes-version: v1.19.0
-    knative-version: v0.17.0
-    knative-serving-version: v0.17.4
-    net-kourier-version: v0.17.2
-    knative-eventing-version: v0.17.8
-    knative-sources-version: v0.17.7
-    kn-client-version: v0.17.3
+    knative-version: v0.19.0
+    knative-serving-version: v0.19.0
+    net-kourier-version: v0.19.0
+    knative-eventing-version: v0.19.2
+    knative-sources-version: v0.19.0
+    kn-client-version: v0.19.1
     kubernetes-cli: kubectl
     release-version: master
     page-pagination: true
     openshift-console-url: https://console-openshift-console.apps.example.com
     etherpad-url: http://example.com
+    repo-base: https://github.com/redhat-developer-demos/knative-tutorial
   extensions:
     - ./lib/remote-include-processor.js
     - ./lib/tab-block.js

documentation/modules/ROOT/pages/_partials/serving-nav.adoc

@@ -26,8 +26,10 @@ endif::[]
 ** xref:serving:basic-fundas.adoc#deploying-new-revision[Deploy a New Revision of a Service]
 ** xref:serving:basic-fundas.adoc#basics-cleanup[Cleanup]
 
-* xref:serving:traffic-distribution.adoc[Traffic Distribution]
-** xref:serving:traffic-distribution.adoc#deploying-revisions[Arbitrary Revision Names]
+* xref:serving:traffic-distribution.adoc[Revisions and Traffic Distribution]
+** xref:serving:traffic-distribution.adoc#deploy-colors-service[Deploy Colors Service]
+** xref:serving:traffic-distribution.adoc#deploying-new-revision[Deploy New Revision]
+** xref:serving:traffic-distribution.adoc#tag-service-revisions[Tagging Revisions]
 ** xref:serving:traffic-distribution.adoc#blue-green[Blue-Green Deployment]
 ** xref:serving:traffic-distribution.adoc#canary-release[Canary Release]
 

documentation/modules/ROOT/pages/_partials/setup-nav.adoc

@@ -1,4 +1,5 @@
-** xref:setup:tutorial-sources.adoc#download-tutorial-sources[Download Tutorial Sources]
+** xref:setup:setup.adoc#download-tutorial-sources[Tutorial Sources]
+** xref:setup:setup.adoc#tools[Tutorial Tools]
 ** xref:setup:kubernetes-cluster.adoc#kubernetes-cluster[Choose your Kubernetes Cluster]
 *** xref:setup:minikube.adoc[Minikube]
 **** xref:setup:minikube.adoc#start-minikube[Configure and Start Minikube]
@@ -8,8 +9,4 @@
 **** xref:setup:minikube.adoc#install-ingress-controller[Install Ingress Controller]
 **** xref:setup:minikube.adoc#install-knative-eventing[Install Knative Eventing]
 **** xref:setup:minikube.adoc#create-tutorial-namespace[Create Tutorial Namespace]
-*** xref:setup:openshift.adoc[OpenShift]
-** xref:setup:setup.adoc[Development Environment]
-// TODO - not sure we need this 
-// *** xref:setup:setup.adoc[Install Locally]
-// *** xref:setup:tutorial-dev-env.adoc[All in One]
+*** xref:setup:openshift.adoc[OpenShift]

documentation/modules/serving/examples/serving/colors-service-blue.yaml

@@ -0,0 +1,14 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  name: blue-green-canary
+spec:
+  template:
+    spec:
+      containers:
+        - image: quay.io/rhdevelopers/blue-green-canary
+          env:
+            - name: BLUE_GREEN_CANARY_COLOR
+              value: "#6bbded"
+            - name: BLUE_GREEN_CANARY_MESSAGE
+              value: "Hello"

documentation/modules/serving/examples/serving/colors-service-canary.yaml

@@ -0,0 +1,14 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  name: blue-green-canary
+spec:
+  template:
+    spec:
+      containers:
+        - image: quay.io/rhdevelopers/blue-green-canary
+          env:
+            - name: BLUE_GREEN_CANARY_COLOR
+              value: "#f2f25e"
+            - name: BLUE_GREEN_CANARY_MESSAGE
+              value: "Bonjour"

documentation/modules/serving/examples/serving/colors-service-green.yaml

@@ -0,0 +1,14 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  name: blue-green-canary
+spec:
+  template:
+    spec:
+      containers:
+        - image: quay.io/rhdevelopers/blue-green-canary
+          env:
+            - name: BLUE_GREEN_CANARY_COLOR
+              value: "#5bbf45"
+            - name: BLUE_GREEN_CANARY_MESSAGE
+              value: "Namaste"