diff --git a/documentation/modules/ROOT/pages/1setup.adoc b/documentation/modules/ROOT/pages/1setup.adoc index 3b77b51c..7ea507ad 100644 --- a/documentation/modules/ROOT/pages/1setup.adoc +++ b/documentation/modules/ROOT/pages/1setup.adoc @@ -11,7 +11,7 @@ You can complete this tutorial using a local Minikube environment, or you can us IMPORTANT: If you're using OpenShift instead of Minikube skip ahead to the link:#istioinstallation[Install Istio section] and select the OpenShift tab. -include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/master/prerequisites-kubernetes.adoc[] +include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/main/prerequisites-kubernetes.adoc[] | `istioctl` | https://github.com/istio/istio/releases/download/{istio-version}/istio-{istio-version}-osx.tar.gz[Download] @@ -22,14 +22,14 @@ include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-c === Download Tutorial Sources // Uses the tutorial-url and folder variables declared at the top of this file -include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/master/download-sources.adoc[] +include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/main/download-sources.adoc[] [#install-minikube] === Install Minikube IMPORTANT: If the *bin/* directory already exists in the `$TUTORIAL_HOME` location, replace the `mkdir bin && cd bin` with `cd bin` in the steps below. -include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/master/install-minikube.adoc[] +include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/main/install-minikube.adoc[] [#start-kubernetes] === Start Minikube @@ -37,7 +37,7 @@ include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-c There are series of commands as steps that allows you get started with minikube. The following section shows how to start minikube with minimal and required configurations: :profile: istio-devnation -include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/master/kubernetes-setup.adoc[] +include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/main/kubernetes-setup.adoc[] [#istioinstallation] diff --git a/documentation/modules/ROOT/pages/2deploy-microservices.adoc b/documentation/modules/ROOT/pages/2deploy-microservices.adoc index 45ff7ef4..f6e1df76 100644 --- a/documentation/modules/ROOT/pages/2deploy-microservices.adoc +++ b/documentation/modules/ROOT/pages/2deploy-microservices.adoc @@ -112,7 +112,7 @@ oc new-project tutorial ; oc project tutorial ---- // Uses the tutorial-url and folder variables declared at the top of this file -include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/master/download-sources.adoc[] +include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/main/download-sources.adoc[] IMPORTANT: The OpenShift Web Terminal is not a persistent environment. The `istio-tutorial` folder, `TUTORIAL_HOME`, and set environment variables will be lost if the OpenShift Web Terminal is closed or idled after a few minutes of inactivity. Return to this section and run the `git clone`, `export`, and `cd` commands again if necessary to reconfigure a Web Terminal session. @@ -137,7 +137,7 @@ oc new-project tutorial ; oc project tutorial ---- // Uses the tutorial-url and folder variables declared at the top of this file -include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/master/download-sources.adoc[] +include::https://raw.githubusercontent.com/redhat-developer-demos/rhd-tutorial-common/main/download-sources.adoc[] -- ==== diff --git a/documentation/modules/ROOT/pages/4simple-routerules.adoc b/documentation/modules/ROOT/pages/4simple-routerules.adoc index cd586318..268ac2cd 100644 --- a/documentation/modules/ROOT/pages/4simple-routerules.adoc +++ b/documentation/modules/ROOT/pages/4simple-routerules.adoc @@ -16,12 +16,36 @@ If you *have not built* the images on your own then let's deploy the customer po == Deploy Recommendation microservice V2 using an existing image +[tabs, subs="attributes+,+macros"] +==== +Minikube:: ++ +-- + +In a new terminal window run: + [.console-input] [source,bash,subs="+macros,+attributes"] ---- kubectl apply -f <(istioctl kube-inject -f link:{github-repo}/{recommendation-repo}/kubernetes/Deployment-v2.yml[{recommendation-repo}/kubernetes/Deployment-v2.yml]) -n tutorial{namespace-suffix} ---- +-- +OpenShift:: ++ +-- + +[.console-input] +[source,bash,subs="+macros,+attributes"] +---- +kubectl -f link:{github-repo}/{recommendation-repo}/kubernetes/Deployment-v2.yml -n tutorial{namespace-suffix} +---- + +-- +==== + + + === Wait for v2 to be deployed Wait for those pods to show "2/2", the istio-proxy/envoy sidecar is part of that pod