From a58e21e313136b07880b791e59f86983702ac0e8 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 10 Apr 2018 12:15:01 -0500 Subject: [PATCH 1/6] URL update --- slides/kube/concepts-k8s.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/kube/concepts-k8s.md b/slides/kube/concepts-k8s.md index 1cd2e93a..cd5881d6 100644 --- a/slides/kube/concepts-k8s.md +++ b/slides/kube/concepts-k8s.md @@ -221,7 +221,7 @@ Yes! *Probably not (in the future)* -.footnote[More information about CRI [on the Kubernetes blog](http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html)] +.footnote[More information about CRI [on the Kubernetes blog](https://kubernetes.io/blog/2016/12/container-runtime-interface-cri-in-kubernetes) --- From 44e0cfb878f1a74c1a22c9963c9f1ef83eb8b2e5 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 10 Apr 2018 12:22:24 -0500 Subject: [PATCH 2/6] Adding an article --- slides/common/declarative.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/common/declarative.md b/slides/common/declarative.md index 14dcd1c3..f9062d0a 100644 --- a/slides/common/declarative.md +++ b/slides/common/declarative.md @@ -8,7 +8,7 @@ - Imperative: - *Boil some water. Pour it in a teapot. Add tea leaves. Steep for a while. Serve in cup.* + *Boil some water. Pour it in a teapot. Add tea leaves. Steep for a while. Serve in a cup.* -- From 83bba80f3b712d595fcc74eb27c849732e687295 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 10 Apr 2018 12:25:44 -0500 Subject: [PATCH 3/6] URL update --- slides/kube/kubectlget.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/kube/kubectlget.md b/slides/kube/kubectlget.md index 73cba993..f910dfb5 100644 --- a/slides/kube/kubectlget.md +++ b/slides/kube/kubectlget.md @@ -265,4 +265,4 @@ The `kube-system` namespace is used for the control plane. ] -- -- `kube-public` is created by kubeadm & [used for security bootstrapping](http://blog.kubernetes.io/2017/01/stronger-foundation-for-creating-and-managing-kubernetes-clusters.html) +- `kube-public` is created by kubeadm & [used for security bootstrapping](https://kubernetes.io/blog/2017/01/stronger-foundation-for-creating-and-managing-kubernetes-clusters) From d3c0a60de9153976d6da7743053c8abae8bbd967 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 10 Apr 2018 12:30:46 -0500 Subject: [PATCH 4/6] link to VM prep README --- slides/kube/setup-k8s.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/slides/kube/setup-k8s.md b/slides/kube/setup-k8s.md index 03230e3c..82bdbbeb 100644 --- a/slides/kube/setup-k8s.md +++ b/slides/kube/setup-k8s.md @@ -20,6 +20,8 @@ 6. Copy the configuration file generated by `kubeadm init` +(details in the [prepare VMs README](https://github.com/jpetazzo/container.training/blob/master/prepare-vms/README.md)) + --- ## `kubeadm` drawbacks From c7198b35387363191a8c53562ffed9e11edfa95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20GARROUSTE?= Date: Tue, 10 Apr 2018 22:56:42 +0200 Subject: [PATCH 5/6] correction --- slides/intro/Building_Images_With_Dockerfiles.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/intro/Building_Images_With_Dockerfiles.md b/slides/intro/Building_Images_With_Dockerfiles.md index d45da8b4..6c4ed788 100644 --- a/slides/intro/Building_Images_With_Dockerfiles.md +++ b/slides/intro/Building_Images_With_Dockerfiles.md @@ -143,14 +143,14 @@ Removing intermediate container e01b294dbffd ---> eb8d9b561b37 ``` -* The `RUN` command is executed in this container. - * A container (`e01b294dbffd`) is created from the base image. -* The build container (`e01b294dbffd`) is removed. +* The `RUN` command is executed in this container. * The container is committed into an image (`eb8d9b561b37`). +* The build container (`e01b294dbffd`) is removed. + * The output of this step will be the base image for the next one. --- From c508f88af2ee7ec6390886f1fbb7e1f9f5af8201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Tue, 10 Apr 2018 16:56:07 -0500 Subject: [PATCH 6/6] Update setup-k8s.md --- slides/kube/setup-k8s.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/kube/setup-k8s.md b/slides/kube/setup-k8s.md index 82bdbbeb..fcb556ad 100644 --- a/slides/kube/setup-k8s.md +++ b/slides/kube/setup-k8s.md @@ -20,7 +20,7 @@ 6. Copy the configuration file generated by `kubeadm init` -(details in the [prepare VMs README](https://github.com/jpetazzo/container.training/blob/master/prepare-vms/README.md)) +- Check the [prepare VMs README](https://github.com/jpetazzo/container.training/blob/master/prepare-vms/README.md) for more details ---