From 6f3580820cf74fbb03906eccd7be0f2881114aa7 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Thu, 6 Sep 2018 10:42:59 -0500 Subject: [PATCH 1/3] Update gitworkflows.md slight corrections --- slides/k8s/gitworkflows.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/k8s/gitworkflows.md b/slides/k8s/gitworkflows.md index bd285e96..6a620447 100644 --- a/slides/k8s/gitworkflows.md +++ b/slides/k8s/gitworkflows.md @@ -22,7 +22,7 @@ - These resources have a perfect YAML representation -- All we do is manpulating these YAML representations +- All we do is manipulating these YAML representations (`kubectl run` generates a YAML file that gets applied) @@ -148,7 +148,7 @@ - Gitkube is a git server (or "git remote") -- After making changes to the repository, we push to GitKube +- After making changes to the repository, we push to Gitkube - Gitkube applies the resources to the cluster @@ -234,6 +234,6 @@ (see the [documentation](https://github.com/hasura/gitkube/blob/master/docs/remote.md) for more details) -- Gitkube can also deploy a Helm Charts +- Gitkube can also deploy Helm Charts (instead of raw YAML files) From 8182e4df9631160e0c30fbe7f8461fd5cbbfb89d Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Thu, 6 Sep 2018 10:56:59 -0500 Subject: [PATCH 2/3] Update portworx.md Slight corrections for clarity --- slides/k8s/portworx.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/k8s/portworx.md b/slides/k8s/portworx.md index b3bf89a6..db6eae29 100644 --- a/slides/k8s/portworx.md +++ b/slides/k8s/portworx.md @@ -212,7 +212,7 @@ If you want to use an external key/value store, add one of the following: - It is also possible to mark a Storage Class as "default" - (it will be used if a `volumeClaimTeamplate` doesn't specify one) + (it will be used if a `volumeClaimTemplate` doesn't specify one) --- @@ -235,7 +235,7 @@ parameters: - It says "use Portworx to create volumes" -- It tells to Portworx "keep 2 replicas of these volumes" +- It tells Portworx to "keep 2 replicas of these volumes" - It marks the Storage Class as being the default one @@ -497,7 +497,7 @@ By "disrupt" we mean: "disconnect it from the network". .exercise[ -- Look on which node the pod is now running +- Look at which node the pod is now running on ```bash kubectl get pod postgres-0 -o wide ``` From f1ebb1f0fb8a07c812c0e7b74c86649fc3cf6436 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Thu, 6 Sep 2018 11:05:17 -0500 Subject: [PATCH 3/3] slight corrections --- slides/k8s/ingress.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/k8s/ingress.md b/slides/k8s/ingress.md index 218d64e3..b7113e42 100644 --- a/slides/k8s/ingress.md +++ b/slides/k8s/ingress.md @@ -46,7 +46,7 @@ (look at [jpetazzo/aiguillage](https://github.com/jpetazzo/aiguillage) for a minimal reverse proxy configuration using NGINX) -- Most of these options require to update/edit configuration files after each change +- Most of these options require us to update/edit configuration files after each change - Some of them can pick up virtual hosts and backends from a configuration store @@ -176,7 +176,7 @@ - We are going to use a Daemon Set so that each node can accept connections -- We will do two minor changes to the [YAML provided my Traefik](https://github.com/containous/traefik/blob/master/examples/k8s/traefik-ds.yaml): +- We will do two minor changes to the [YAML provided by Traefik](https://github.com/containous/traefik/blob/master/examples/k8s/traefik-ds.yaml): - enable `hostNetwork` @@ -503,7 +503,7 @@ spec: - Annotations can encode special features - (rate-limiting, A/B testing, session stickyness, etc.) + (rate-limiting, A/B testing, session stickiness, etc.) ---