diff --git a/slides/k8s/authn-authz.md b/slides/k8s/authn-authz.md index 5979ca05..d2e3b339 100644 --- a/slides/k8s/authn-authz.md +++ b/slides/k8s/authn-authz.md @@ -168,7 +168,7 @@ class: extra-details (`O=system:nodes`, `CN=system:node:name-of-the-node`) -- The Kubernetse API can act as a CA +- The Kubernetes API can act as a CA (by wrapping an X509 CSR into a CertificateSigningRequest resource) diff --git a/slides/k8s/helm-create-better-chart.md b/slides/k8s/helm-create-better-chart.md index b7ef8851..a76a2032 100644 --- a/slides/k8s/helm-create-better-chart.md +++ b/slides/k8s/helm-create-better-chart.md @@ -157,7 +157,7 @@ class: extra-details (as opposed to, e.g., installing a new release each time we run it) -- Other example: `kubectl -f some-file.yaml` +- Other example: `kubectl apply -f some-file.yaml` --- diff --git a/slides/k8s/helm-dependencies.md b/slides/k8s/helm-dependencies.md index cc696c27..6f65ca90 100644 --- a/slides/k8s/helm-dependencies.md +++ b/slides/k8s/helm-dependencies.md @@ -66,7 +66,7 @@ Where do that `repository` and `version` come from? -We're assuming here that we did our reserach, +We're assuming here that we did our research, or that our resident Helm expert advised us to use Bitnami's Redis chart. diff --git a/slides/k8s/metrics-server.md b/slides/k8s/metrics-server.md index 5cfdf02c..997f715f 100644 --- a/slides/k8s/metrics-server.md +++ b/slides/k8s/metrics-server.md @@ -99,9 +99,9 @@ Pros: - That Pod will fetch metrics from all our Nodes -- It will expose them through the Kubernetes API agregation layer +- It will expose them through the Kubernetes API aggregation layer - (we won't say much more about that agregation layer; that's fairly advanced stuff!) + (we won't say much more about that aggregation layer; that's fairly advanced stuff!) --- @@ -128,7 +128,7 @@ Pros: - `apiService.create=true` - register `metrics-server` with the Kubernetes agregation layer + register `metrics-server` with the Kubernetes aggregation layer (create an entry that will show up in `kubectl get apiservices`) diff --git a/slides/k8s/operators-design.md b/slides/k8s/operators-design.md index 4cf5bd34..04fb3763 100644 --- a/slides/k8s/operators-design.md +++ b/slides/k8s/operators-design.md @@ -127,7 +127,7 @@ class: extra-details - either directly - or by extending the API server -
(for instance by using the agregation layer, like [metrics server](https://github.com/kubernetes-incubator/metrics-server) does) +
(for instance by using the aggregation layer, like [metrics server](https://github.com/kubernetes-incubator/metrics-server) does) --- diff --git a/slides/k8s/pod-security-admission.md b/slides/k8s/pod-security-admission.md index c8033d7c..91560dd1 100644 --- a/slides/k8s/pod-security-admission.md +++ b/slides/k8s/pod-security-admission.md @@ -6,7 +6,7 @@ - Easier to use - (doesn't require complex interaction bewteen policies and RBAC) + (doesn't require complex interaction between policies and RBAC) --- @@ -206,7 +206,7 @@ class: extra-details - If new namespaces are created, they will get default permissions -- We can change that be using an *admission configuration* +- We can change that by using an *admission configuration* - Step 1: write an "admission configuration file" @@ -232,7 +232,7 @@ Let's use @@LINK[k8s/admission-configuration.yaml]: - For convenience, let's copy it do `/etc/kubernetes/pki` - (it's definitely where it *should* be, but that'll do!) + (it's definitely not where it *should* be, but that'll do!) .lab[ diff --git a/slides/k8s/secrets.md b/slides/k8s/secrets.md index 8795e87f..94aadb07 100644 --- a/slides/k8s/secrets.md +++ b/slides/k8s/secrets.md @@ -72,7 +72,7 @@ ## Accessing private repositories -- Let's see how to access an image on private registry! +- Let's see how to access an image on a private registry! - These images are protected by a username + password @@ -243,7 +243,7 @@ class: extra-details ## Encryption at rest -- It is possible to [encrypted secrets at rest](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/) +- It is possible to [encrypt secrets at rest](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/) - This means that secrets will be safe if someone ...