Update links, rendering and comments from latest training

config/puzzle/config.toml

@@ -1,11 +1,11 @@
 theme = ["docsy-puzzle", "docsy-plus", "docsy"]
 
 [params]
-copyright = "Puzzle ITC GmbH"
+copyright = "Puzzle ITC"
 imagePrefix = "puzzle_"
 
 [[Languages.en.menu.main]]
-copyright = "Puzzle ITC GmbH"
+copyright = "Puzzle ITC"
 url = "https://www.puzzle.ch"
 
 ############################## social links ##############################
@@ -16,9 +16,6 @@ icon = "fab fa-github"
 url = "https://github.com/acend/container-basics-training"
 
 [[params.links.user]]
-name = "Twitter"
-icon = "fab fa-twitter"
-url = "https://twitter.com/puzzleitc"
 
 [[params.links.user]]
 name = "LinkedIn"

content/en/docs/helm/complex-example.md

@@ -71,7 +71,7 @@ mariadb:
 ```
 
 {{% alert title="Note" color="info" %}}
-Make sure to set the proper value as hostname. `appdomain` will be provided by the trainer.
+Make sure to set the proper value as hostname. `<appdomain>` will be provided by the trainer.
 {{% /alert %}}
 
 If you look inside the [Chart.yaml](https://github.com/bitnami/charts/blob/master/bitnami/wordpress/Chart.yaml) file of the WordPress chart, you'll see a dependency to the [MariaDB Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/mariadb). All the MariaDB values are used by this dependent Helm chart and the chart is automatically deployed when installing WordPress.

content/en/docs/helm/installation.md

@@ -8,7 +8,7 @@ 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.
+If you do this training in our web based environment, no installation is required.
 {{% /alert %}}
 
 

content/en/docs/helm/simplechart.md

@@ -34,13 +34,14 @@ image:
 ...
 ```
 
-And then change the port in the `mychart/values.yaml`
+And then change the containerPort in the `mychart/templates/deployment.yaml`
 
 ```yaml
 ...
-service:
-  type: ClusterIP
-  port: 8080
+ports:
+- name: http
+  containerPort: 8080
+  protocol: TCP
 ...
 ```
 
@@ -156,7 +157,7 @@ spec:
 Thus, we need to change this value inside our `mychart/values.yaml` file. This is also where we enable the TLS part:
 
 {{% alert title="Note" color="info" %}}
-Make sure to replace the `namespace` and `appdomain` accordingly.
+Make sure to replace the `<namespace>` and `<appdomain>` accordingly.
 {{% /alert %}}
 
 {{% onlyWhen openshift %}}
@@ -199,7 +200,7 @@ ingress:
 {{% /onlyWhenNot %}}
 
 {{% alert title="Note" color="info" %}}
-Make sure to set the proper value as hostname. `appdomain` will be provided by the trainer.
+Make sure to set the proper value as hostname. `<appdomain>` will be provided by the trainer.
 {{% /alert %}}
 
 Apply the change by upgrading our release:

content/en/docs/introduction/_index.md

@@ -135,7 +135,9 @@ A Pod is the smallest entity in Kubernetes.
 A Pod is the smallest entity in Kubernetes and OpenShift.
 {{% /onlyWhen %}}
 It represents one instance of your running application process.
-The Pod consists of at least one container which contains your application.
+The Pod consists of at least two containers, one for your application itself and another one as part of the Kubernetes design, to keep the network namespace.
+The so-called infrastructure container (or pause container) is therefore automatically added by Kubernetes.
+
 The application ports from inside the Pod are exposed via Services.
 
 

content/en/docs/kubernetes-and-openshift-differences/_index.md

@@ -36,7 +36,7 @@ In {{<link "first-steps">}} you created your first Project on OpenShift.
 You won't find the concept of a "Project" in Kubernetes except in other Kubernetes distributions, specifically in Rancher.
 
 {{% alert title="Note" color="info" %}}
-[Rancher's](https://rancher.com/docs/rancher/v2.x/en/cluster-admin/projects-and-namespaces/#about-projects) and [OpenShift's](https://docs.openshift.com/container-platform/latest/rest_api/project_apis/project-apis-index.html) concepts of a project have nothing in common.
+[Rancher's](https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces) and [OpenShift's](https://docs.openshift.com/container-platform/latest/rest_api/project_apis/project-apis-index.html) concepts of a project have nothing in common.
 {{% /alert %}}
 
 A Project in OpenShift is based on the Namespace resource type.
@@ -83,6 +83,16 @@ Your Ingress resource should look similar to this:
 {{< readfile file="/content/en/docs/kubernetes-and-openshift-differences/ingress_v1.yaml" code="true" lang="yaml" >}}
 
 
+### Deployments and DeploymentConfigs
+
+OpenShift introduced the concept of _DeploymentConfigs_ which later got introduced to upstream Kubernetes as Deployments.
+The reason they don't have the same name is because Deployments lack some features that DeploymentConfigs offer.
+It's advisable however to use Deployments wherever possible as they're compatible with other Kubernetes distributions where DeploymentConfigs are only supported on OpenShift.
+
+The [OpenShift documentation](https://docs.openshift.com/container-platform/latest/applications/deployments/what-deployments-are.html) offers a detailed explanation of the differences.
+The features additionally offered by DeploymentConfigs can be summarized as automation features to e.g. automatically trigger a new deployment when the upstream image is updated.
+
+
 ### ImageStreams
 
 One of the reasons Kubernetes Deployments cannot support the missing automation features is because in OpenShift, they are based on other resource types like the _ImageStream_.

content/en/docs/kustomize/_index.md

@@ -220,7 +220,6 @@ My name is kustomize-app-production
 
 Kustomize has more features of which we just covered a couple. Please refer to the docs for more information.
 
-* Kustomize documentation: <https://kubernetes-sigs.github.io/kustomize/>
-* API reference: <https://kubernetes-sigs.github.io/kustomize/api-reference/>
-* Another `kustomization.yaml` reference: <https://kubectl.docs.kubernetes.io/pages/reference/kustomize.html>
+* Kustomize documentation: <https://kubectl.docs.kubernetes.io/guides/>
+* Kustomize reference docs: <https://kubectl.docs.kubernetes.io/references/kustomize/>
 * Examples: <https://github.com/kubernetes-sigs/kustomize/tree/master/examples>