From 21ba3b7713a79db0afdfcab19edd64bbcfe345d5 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Thu, 6 Sep 2018 02:12:47 -0500 Subject: [PATCH] Incorporate Bridget's feedback --- slides/k8s/build-with-docker.md | 10 +++++----- slides/k8s/build-with-kaniko.md | 4 +++- slides/k8s/configuration.md | 2 +- slides/k8s/healthchecks.md | 4 ++-- slides/k8s/owners-and-dependents.md | 2 +- slides/k8s/statefulsets.md | 4 ++-- slides/k8s/volumes.md | 6 +++--- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/slides/k8s/build-with-docker.md b/slides/k8s/build-with-docker.md index e4ba919e..4948fc2a 100644 --- a/slides/k8s/build-with-docker.md +++ b/slides/k8s/build-with-docker.md @@ -62,9 +62,9 @@ spec: - The port for the registry is passed through an environment variable - (this avoids to repeat it in the specification, which would be error-prone) + (this avoids repeating it in the specification, which would be error-prone) -.warning[The environment variable has to be a string, so the `"` are mandatory!] +.warning[The environment variable has to be a string, so the `"`s are mandatory!] --- @@ -74,7 +74,7 @@ spec: - It is then mounted in the container onto the default Docker socket path -- We show a creative way to specify the commands to run in the container: +- We show a interesting way to specify the commands to run in the container: - the command executed will be `sh -c ` @@ -133,7 +133,7 @@ What do we need to change to make this production-ready? -- -That's why systems like Docker Hub are helpful. +That's why services like Docker Hub (with [automated builds](https://docs.docker.com/docker-hub/builds/)) are helpful.
They handle the whole "code repository → Docker image" workflow. @@ -143,7 +143,7 @@ They handle the whole "code repository → Docker image" workflow. - This is talking directly to a node's Docker Engine to build images -- It bypasses ressource allocation mechanisms used by Kubernetes +- It bypasses resource allocation mechanisms used by Kubernetes (but you can use *taints* and *tolerations* to dedicate builder nodes) diff --git a/slides/k8s/build-with-kaniko.md b/slides/k8s/build-with-kaniko.md index 0741cf8e..b6a006a9 100644 --- a/slides/k8s/build-with-kaniko.md +++ b/slides/k8s/build-with-kaniko.md @@ -67,7 +67,9 @@ We use `--net host` so that we can connect to the registry over `127.0.0.1`. - We need to mount or copy the build context to the pod -- For bonus points, we are going to build straight from the git repository +- We are going to build straight from the git repository + + (to avoid depending on files sitting on a node, outside of containers) - We need to `git clone` the repository before running Kaniko diff --git a/slides/k8s/configuration.md b/slides/k8s/configuration.md index cdeeacc5..6b25668f 100644 --- a/slides/k8s/configuration.md +++ b/slides/k8s/configuration.md @@ -14,7 +14,7 @@ - ... and more (because programmers can be very creative!) -- How can we fit that with containers and Kubernetes? +- How can we do these things with containers and Kubernetes? --- diff --git a/slides/k8s/healthchecks.md b/slides/k8s/healthchecks.md index 8935b4d9..2563da68 100644 --- a/slides/k8s/healthchecks.md +++ b/slides/k8s/healthchecks.md @@ -106,7 +106,7 @@ - Rolling updates proceed when containers are *actually ready* - (as opposed top merely started) + (as opposed to merely started) - Containers in a broken state gets killed and restarted @@ -167,7 +167,7 @@ If the Redis process becomes unresponsive, it will be killed. ## Details about liveness and readiness probes -- Probes are executed at intervals of `periodseconds` (default: 10) +- Probes are executed at intervals of `periodSeconds` (default: 10) - The timeout for a probe is set with `timeoutSeconds` (default: 1) diff --git a/slides/k8s/owners-and-dependents.md b/slides/k8s/owners-and-dependents.md index 098be384..e161f628 100644 --- a/slides/k8s/owners-and-dependents.md +++ b/slides/k8s/owners-and-dependents.md @@ -154,4 +154,4 @@ so the lines should not be indented (otherwise the indentation will insert space ] -As always, the [doc](https://kubernetes.io/docs/concepts/workloads/controllers/garbage-collection/) has useful extra information and pointers. \ No newline at end of file +As always, the [documentation](https://kubernetes.io/docs/concepts/workloads/controllers/garbage-collection/) has useful extra information and pointers. \ No newline at end of file diff --git a/slides/k8s/statefulsets.md b/slides/k8s/statefulsets.md index 0e754e63..d9564d9f 100644 --- a/slides/k8s/statefulsets.md +++ b/slides/k8s/statefulsets.md @@ -147,7 +147,7 @@ spec: - the access mode (e.g. "read-write by a single pod") -- In can also give extra details, like: +- It can also give extra details, like: - which storage system to use (e.g. Portworx, EBS...) @@ -298,7 +298,7 @@ consul agent -data=dir=/consul/data -client=0.0.0.0 -server -ui \ - We can specify DNS names, but then they have to be FQDN -- It's OK to specify ourselves in the list as well +- It's OK for a pod to include itself in the list as well - We can therefore use the same command-line on all nodes (easier!) diff --git a/slides/k8s/volumes.md b/slides/k8s/volumes.md index be6ec439..2773d185 100644 --- a/slides/k8s/volumes.md +++ b/slides/k8s/volumes.md @@ -14,7 +14,7 @@ - store persistent data for stateful services - - access storage systems (like Ceph, EBS, NFS, portworx, and many others) + - access storage systems (like Ceph, EBS, NFS, Portworx, and many others) --- @@ -28,9 +28,9 @@ - Docker volumes allow to share data between containers running on the same host -- Kubernetes volumes allow to share data between containers in the same pod +- Kubernetes volumes allow us to share data between containers in the same pod -- Both Docker and Kubernetes volumes allow access to storage systems +- Both Docker and Kubernetes volumes allow us access to storage systems - Kubernetes volumes are also used to expose configuration and secrets