some minor improvements

content/en/docs/exposing-a-service/_index.md

@@ -167,7 +167,7 @@ The `Endpoints` show the IP addresses of all currently matched Pods.
 
 With the ClusterIP Service ready, we can now create the {{% onlyWhenNot openshift %}}Ingress{{% /onlyWhen %}}{{% onlyWhen openshift %}}Route{{% /onlyWhen %}} resource.
 {{% onlyWhenNot openshift %}}
-In order to create the Ingress resource, we first need to create the file `ingress.yaml` and change the `host` entry to match your environment:
+In order to create the Ingress resource, we first need to create the file `ing-example-web-go.yaml` and change the `host` entry to match your environment:
 
 {{% onlyWhenNot customer %}}
 {{< readfile file="/content/en/docs/exposing-a-service/ingress.template.yaml" code="true" lang="yaml" >}}
@@ -178,7 +178,7 @@ As you see in the resource definition at `spec.rules[0].http.paths[0].backend.se
 Let's create the Ingress resource with:
 
 ```bash
-kubectl apply -f ingress.yaml --namespace <namespace>
+kubectl apply -f ing-example-web-go.yaml --namespace <namespace>
 ```
 
 Afterwards, we are able to access our freshly created Ingress at `http://example-web-go-<namespace>.<appdomain>`

content/en/docs/first-steps/_index.md

@@ -7,7 +7,7 @@ In this lab, we will interact with the {{% param distroName %}} cluster for the
 
 {{% onlyWhenNot nosetup %}}
 {{% alert title="Warning" color="warning" %}}
-Please make sure you completed {{<link "setup">}} before you continue with this lab.
+Please make sure you completed {{<link "setup">}} before you continue with this lab. If you do this training in our acend web based environment, no setup is required.
 {{% /alert %}}
 {{% /onlyWhenNot %}}
 {{% onlyWhenNot openshift %}}
@@ -22,16 +22,15 @@ Authentication depends on the specific Kubernetes cluster environment. You may n
 
 ## Namespaces
 
+{{% alert title="Note" color="info" %}}
+If you work in our acend web based environment, your Namespace has already been created and you can skip this task.
+{{% /alert %}}
 
 A Namespace is a logical design used in Kubernetes to organize and separate your applications, Deployments, Pods, Ingresses, Services, etc. on a top-level basis. Take a look at the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/). Authorized users inside a namespace are able to manage those resources. Namespace names have to be unique in your cluster.
 
 
 ### {{% task %}} Create a Namespace
 
-{{% alert title="Note" color="info" %}}
-If you work in our lab environment, your Namespace has already been created and you can skip this task.
-{{% /alert %}}
-
 Create a new namespace on the Kubernetes Cluster.. The `kubectl help` output can help you figure out the right command.
 
 {{% alert title="Note" color="info" %}}

content/en/docs/helm/installation.md

@@ -7,6 +7,10 @@ This guide shows you how to install the `helm` CLI tool. `helm` can be installed
 We are going to use the pre-built releases.
 `helm` binaries can be found on [Helm's release page](https://github.com/helm/helm/releases) for the usual variety of operating systems.
 
+{{% alert title="Warning" color="warning" %}}
+If you do this training in our acend web based environment, no installation is required.
+{{% /alert %}}
+
 
 ## {{% task %}} Install CLI
 

content/en/docs/introduction/_index.md

@@ -51,6 +51,8 @@ Kubernetes consists of control plane and worker (minion, compute) nodes.
 OpenShift basically consists of control plane and worker nodes.
 {{% /onlyWhen %}}
 
+![Kubernetes Architecture](architecture.png)
+
 
 ### Control plane and worker nodes
 
@@ -181,3 +183,19 @@ Have a look at the [official documentation](https://kubernetes.io/docs/concepts/
 {{% onlyWhen openshift %}}
 Have a look at the [official documentation](https://docs.openshift.com/container-platform/latest/nodes/jobs/nodes-nodes-jobs.html).
 {{% /onlyWhen %}}
+
+
+## History
+
+There is a official Kubernetes Documentary available on Youtube.
+
+* [Kubernetes: The Documentary [PART 1]](https://www.youtube.com/watch?v=BE77h7dmoQU)
+* [Kubernetes: The Documentary [PART 2]](https://www.youtube.com/watch?v=318elIq37PE)
+
+Inspired by the open source success of Docker in 2013 and seeing the need for innovation in the area of large-scale cloud computing, a handful of forward-thinking Google engineers set to work on the container orchestrator that would come to be known as Kubernetes– this new tool would forever change the way the internet is built.
+
+These engineers overcome technical challenges, resistance to open source from within, naysayers, and intense competition from other big players in the industry.
+
+Most engineers know about “The Container Orchestrator Wars’’ but most people would not be able to explain exactly what happened, and why it was Kubernetes that ultimately came out on top.
+
+There is no topic more relevant to the current open source landscape. This film captures the story directly from the people who lived it, featuring interviews with prominent engineers from Google, Red Hat, Twitter and others.

content/en/docs/scaling/_index.md

@@ -157,7 +157,7 @@ and apply the file with:
 {{% param cliToolName %}} apply -f svc-example-app.yaml --namespace <namespace>
 ```
 
-Then we add the Ingress to access our application:
+Then we add the Ingress to access our application. Create a new file `ing-example-web-app.yaml` with the following content:
 
 {{% onlyWhenNot customer %}}
 {{< readfile file="/content/en/docs/scaling/ingress.template.yaml" code="true" lang="yaml" >}}
@@ -166,7 +166,7 @@ Then we add the Ingress to access our application:
 Apply this Ingress definition using, e.g.:
 
 ```yaml
-{{% param cliToolName %}} apply -f ingress.yaml --namespace <namespace>
+{{% param cliToolName %}} apply -f ing-example-web-app.yaml --namespace <namespace>
 ```
 
 {{% /onlyWhenNot %}}
@@ -282,7 +282,7 @@ while true; do sleep 1; curl -s https://${URL}/pod/; date "+ TIME: %H:%M:%S,%3N"
 {{% onlyWhenNot openshift %}}
 ```bash
 URL=$(kubectl get ingress example-web-app -o go-template="{{ (index .spec.rules 0).host }}" --namespace <namespace>)
-while true; do sleep 1; curl -s http://${URL}/pod/; date "+ TIME: %H:%M:%S,%3N"; done
+while true; do sleep 1; curl -s https://${URL}/pod/; date "+ TIME: %H:%M:%S,%3N"; done
 ```
 {{% /onlyWhenNot %}}
 {{% onlyWhenNot baloise %}}

content/en/docs/scaling/ingress.template.yaml

@@ -15,6 +15,6 @@ spec:
                 name: example-web-app
                 port: 
                   number: 5000
-tls:
-  - hosts:
-    - example-web-app-<namespace>.<appdomain>
+  tls:
+    - hosts:
+      - example-web-app-<namespace>.<appdomain>

content/en/docs/troubleshooting/_index.md

@@ -362,7 +362,7 @@ If you created the deployment to see the output, you can delete it again as it's
 
 At this point, you are able to visualize your progress on the labs by browsing through the following page <http://localhost:5000/progress>
 
-If you are not able to open your awesome-app with localhost, because you are using a webshell, you can also use the ingress address like: `example-web-app-<namespace>.<appdomain>/progress` to access the dashboard.
+If you are not able to open your awesome-app with localhost, because you are using a webshell, you can also use the ingress address: `https://example-web-app-<namespace>.<appdomain>/progress` to access the dashboard.
 
 You may need to set some extra permissions to let the dashboard monitor your progress. Have fun!